Merge "Snap for 8366858 from 62302a8ee19b9586255dfe441e27791e07f97efb to main-cg-testing-release" into main-cg-testing-release
tree: 2357a0901a10a4258ebb9e1bd017995e1d61eabb
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml