[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 8c7b42f968 -s ours am: a82677a81c
am: 9497973000

Change-Id: Ibd763380cd760366695ffdd385da94526340a55e
tree: 65bc4eab3a75011ca85556f92587fd63f2fe9385
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg