[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 3f9b1fac1a -s ours am: 9a797d303e
am: ca19e988e0

Change-Id: I2c836358f6e34cb05e10a4305fb9a825e4ab16c2
tree: fcc0349353273aa62f307117a83b9f1fdb7bbef0
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml