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

Bug: 236760014
Merged-In: I1eb7e02cc2b805b381f3dd3439ec68f958949e48
Change-Id: I11e48cc6ee69a0133ac2095307f7d36e563f7d6d
tree: 8bf1cca3c6a8489ef15a8084f45a3b3a0f43c0ce
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml