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

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