[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 9dc8c8ebea -s ours am: 3f48313150
am: 6003f24f06

Change-Id: Iae3935045cae947b0409f630526f623ac13da452
tree: 6b3fe9c4233d07aebb04f622d9b5b6341386bb1f
  1. proto/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS