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

Change-Id: I4adaf6bfedd1f0e1f8413fdc237984b0f1135328
tree: d073c5f6f285c85dd7100ae92ad035c0d10160c5
  1. doc/
  2. include/
  3. src/
  4. tests/
  5. tools/
  6. Android.bp
  7. OWNERS