[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 2cc0d2edfa -s ours am: a8b03b1c84
am: cffed061cb

Change-Id: Ifa6a9b074af0e2cda2b471decff452d673ac9cf2
tree: 74663c9b873bf045eeca9bef759d35345e1cd383
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS