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

Change-Id: I3dc885aef58c77ce295ff67d8e057d86597eb266
tree: 99a6f20963d7d89d8fd066d42841932fd0a0f7e9
  1. .gitignore
  2. OWNERS
  3. PREUPLOAD.cfg
  4. library/
  5. tools/