[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 40fe375111 -s ours
am: e58b6e5ec7

Change-Id: I6c78721de7ea40b1cd69ed36e3b467854709887f
tree: 51ca55298479e4f60a064050e77d5da60931da3b
  1. res/
  2. robotests/
  3. src/
  4. support/
  5. tests/
  6. Android.bp
  7. AndroidManifest.xml
  8. OWNERS