[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: b07fe5145b -s ours am: 1230c52ce5
am: a04f6758f8

Change-Id: I56518e739ccd284345ccce9ff26ec5a7912724dd
tree: a31866a705968b9d851df9500d3899c6b73f464e
  1. art/
  2. hwbinder/
  3. hwui/
  4. scripts/
  5. .gitignore
  6. OWNERS