[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 889541b8d9 -s ours
am: 1e665d1ee4

Change-Id: Icee19ca831582c3bd0a2912fa006e5adb2d3a93e
tree: db22aa44e192ae2ba85ba897457a0a751d718f19
  1. oem_template/
  2. src/
  3. testing/
  4. Android.mk
  5. OWNERS
  6. proguard.cfg
  7. README