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

Change-Id: I0b1db18c8578efc2422329f25846a5407307722a
tree: 8f6b0f6341487865a9887df0d1ab3cbf37a79f3e
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS