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

Bug: 236760014
Merged-In: Ib1fb78de38526a060c7a380731afb6b6d893d07b
Change-Id: Id311106df6bbf3e5a04d21a7fdf7acd0b7cb8588
tree: 7aae48d5dc26e7d85e82f4e37444b97cf418a458
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags