[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: e9f5fb6e81 -s ours
am: 055f58515e

Change-Id: Ic2357c538c44974e071b26e7942462104e6299ca
tree: 122e04a1c30438374f5e6607d70173c85b2ef64d
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS