[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: e9a785696b -s ours am: 83b8f3bda9
am: a01deedf19

Change-Id: I597d942a110b769b675efc95afc08620e1513369
tree: 6a561f5379c73c4eb7ba64915284437755028320
  1. .gitignore
  2. README
  3. apps/
  4. build/
  5. util/