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

Bug: 385190204
Merged-In: If221d194a32a2f84c411cbb440b1a359f0aa27ec
Change-Id: Ie2035d975e8ba2b7812de756dc87aadf20b0392a
tree: 4f4f1434b171c9f74696b7935af39a2cd1ba02e5
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS