Merge 24Q3 (ab/11976889) to aosp-main-future

Bug: 347831320
Merged-In: I57ff7c5ef52fe2cb7c43823768663603640479ab
Change-Id: I8acdfa2cf45ca5bdba29cb239fdf3a086cb67e57
tree: 906a22ea55d1c93c7ddb20308d911ae2155a63bf
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS