[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 8daa88c204 -s ours
am: 021fd3babe

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