Merge cherrypicks of ['googleplex-android-review.googlesource.com/29583007'] into 24Q4-release.

Change-Id: Iefa032c3600aa0026dd09798db22d58784b7ec13
tree: cb18bf9c9fdb87eb417d7df00d800be40654a0a5
  1. res/
  2. src/
  3. .gitignore
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags