Merge tm-dev-plus-aosp-without-vendor@8763363

Bug: 236760014
Merged-In: I0b655cc1fb6d2d4531f311a7448d7fcf673a3247
Change-Id: Ic228855bc830f87275f8d2d03e4261fccec4ea0c
tree: dc8bea7dbcc16796826c03d31d9da61393aca5d1
  1. apex/