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

Change-Id: Ifce0c605a8245af0ae1d0a0770cf04c15224d462
tree: 2ceaf70da2b52f87ba7b13923c19d3bdbfc7f244
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS