[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 5941341ddb -s ours am: d4581df5cc
am: 18bf7467ea

Change-Id: Ibf36bdddc19e1e2f3fb5d374953479e95d25ee25
tree: 6068b4b9fbce32d98a52cd6ec284a418b310dc68
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. OWNERS