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

Bug: 370570306
Merged-In: I463c0940cf596f8de7d2507a2ec141b428304ab8
Change-Id: Ia9381733f07c8b909aa30cf0ce63ab2f300a0873
tree: c23a4b0be9eaebcde4cc6551a7c764c93b6966b8
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS