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

Change-Id: Ib1c020be560a8da3a5abe29d1c231d85adcbdae3
tree: 25262c115ee53a0576886637b8acbe386033a1c6
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS