Merge cherrypicks of ['android-review.googlesource.com/3110843'] into 24Q3-release.

Change-Id: If33a0af6af62ff6f532c0b8ab64e3fde17b8f0f1
tree: 92e66dea2714bcce1fbfa8350b01359cd60d8e58
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS