[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: b03cd5de10 -s ours
am: bd64ebd8e9

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