Merge cherrypicks of ['googleplex-android-review.googlesource.com/31390979'] into 25Q1-release.

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