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

Change-Id: I1456af3df971e2b8aef08d1b5ce72249861a2486
tree: d4d0f1ccfa3d6b82ef0a0be0a353328a3001714d
  1. .gitignore
  2. OWNERS
  3. PREUPLOAD.cfg
  4. library/
  5. tools/