Merge "Merge Android 12"
tree: 74206a35f9d4ac0a153b0ec10b6a32cdb41ebb3c
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS