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

Change-Id: If341f0bc07ad7f2e9fdc010c717fd10540c49a47
tree: babab8bc9f5a26364244e5a89613da787efceaba
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS