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

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