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

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