[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 5fbddd27fc -s ours am: e70c83950a
am: 7b01a940d9

Change-Id: I4fea72fc5fea2fedca36f9d8059af3f444daa7ce
tree: 8e339cb19f246ee8c174eea2fc6038d7e27b01bd
  1. app/
  2. doc/
  3. include/
  4. libs/
  5. tests/
  6. tools/
  7. .clang-format
  8. Android.bp
  9. PREUPLOAD.cfg