[automerger skipped] Audio: Copy HAL V6 into V7 am: 60ced768 am: ccf6fefb...

[automerger skipped] Audio: Copy HAL V6 into V7 am: 60ced768 am: ccf6fefb am: 7ecfd10a am: 4adabf44 -s ours

am skip reason: Change-Id Ifd91cc0bb59608cd92d1d8e4e76c3abea0a8da5e with SHA-1 159260c5 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1475340

Change-Id: Id36b73e59c6b70732104c527790db7f014a56a44