Merge "Merge Android 12"
tree: 130d6360024a00bfc826ef306a28751262eee244
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml