[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 5857caba3d -s ours am: a5fa3ac094
am: 9b3cdfa1a6

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