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

Change-Id: Id7073567ff065ab05515578e9e3fcce363e602ba
tree: d9296fbe865bfe0331ce8871076bae86d729c6a7
  1. res/
  2. Android.bp
  3. AndroidManifest.xml
  4. CleanSpec.mk
  5. OWNERS