[automerger skipped] Merge "Add Audio HAL V7" am: ae44936d6a am: 89d3325e03 am: f3a1860e93 -s ours

am skip reason: Change-Id I134b2151043cc620330619ad5e24a77d59125c1b with SHA-1 96a26b057d is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1507016

Change-Id: Ia4baf2ff6538985b9318fd37f79863d6d156d519