[automerger skipped] DO NOT MERGE - Merge Android 10 into master
am: 048a25a0e6 -s ours
am skip reason: subject contains skip directive

Change-Id: Iceedaf04ba3ba5ed68b0aed7b78046c10a740e00
tree: c42a90aacfe1c07af564ada7ea03e559767ab543
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags