[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 99c42afb19 -s ours
am: 4f890f9fca

Change-Id: I7af8dafc12a2a2ed4ed9376d8a44ee91b64ab0e9
tree: a5c3e70d0c965d5b0cd9dc2e7a9f881fcd4ac971
  1. binder/
  2. docs/
  3. include/
  4. src/
  5. tests/
  6. Android.bp
  7. iorapd.rc
  8. TEST_MAPPING