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

Bug: 370570306
Merged-In: I20acb3c162e47d0bc43585637e2ae2bb7a02123e
Change-Id: Iabef70dbe4c0b900b5a85f81daa48ebc47559dde
tree: 9aa9ad6921e556169bf8b4d9b304893c99ef7e22
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS