Merge 24Q4 (ab/12406339) into aosp-main-future

Bug: 370570306
Merged-In: I4f1a001f2bb919076ad5049cfed275b91c61923d
Change-Id: I6b86be93526610ed7ae9135b1a5f92bb3e117076
tree: 0b1eabdaa28c11f849edeeaf61fcc1bf06e6c73d
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS