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

Change-Id: I7462ea57cff06f0b762441d265dc3a3c9038376f
tree: d5944152a727a06bac6b49c9b8442d046fc6d81e
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg