Merge "Merge 24Q3 to AOSP main" into main
tree: c30fc479eb95c4aac8662ad158bd56e44d93cc17
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS