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

Bug: 236760014
Merged-In: I5d2fc94a1ef4d2b8be7a7aede9ea05829f09eaea
Change-Id: I3c0fcbe96b103e0349c52d99177bf4dd464f7a98
tree: d31cdc970da50e17e50e60f4601c5464a1782785
  1. apex/
  2. Android.bp
  3. OWNERS