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

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