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

Bug: 236760014
Merged-In: Ib05eb81493d0f562f8c6684560f428fd61f68e45
Change-Id: Iec3f127dfcbf511871999a8a6382720b313d1e6f
tree: 892b34dc4b0830c5cfc7e3e4cfe65865bcbb0494
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS