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

Change-Id: Iff9b060c762581f3e22f9e1def552f43ec669af0
tree: edaeb61d341aa6a381f26b36880aa1a8180caa0c
  1. hal/
  2. legacy/
  3. post_proc/
  4. visualizer/
  5. voice_processing/
  6. Android.mk
  7. OWNERS