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

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