[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 3343873fa1 -s ours
am: 8d58738c9f

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