Merge 25Q1 (ab/12770256) to aosp-main-future

Bug: 385190204
Merged-In: If70de4f5fb8713b8bb101e18f927e7bacb183d24
Change-Id: I7621b00f99fa7a3cd60322d5f71e731a784974fc
tree: 30ae2e63d2818a9b542be313985eaf1ff115273d
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS