[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 4a93c21d7d -s ours am: a20bee0e75
am: 4ad9ad3872

Change-Id: I24123a75bdf7ae71230aecf2c1ddfd0060a0d3ef
tree: c097a08b637cc51174e6842078f1beb7b6815257
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS