[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 515697c293 -s ours
am: c48bf0dd0a

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