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

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