[automerger skipped] DO NOT MERGE - Merge Android 10 into master
am: e9f5fb6e81 -s ours
am skip reason: subject contains skip directive

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