[automerger skipped] Merge "Enable support for audio HAL V7 in the framework"...

[automerger skipped] Merge "Enable support for audio HAL V7 in the framework" am: b9fef4fa am: 728025ac am: 4cfd1ff7 -s ours

am skip reason: Change-Id I45d1a8e4f3620f7e6f0a39dccadb7814c4bb086d with SHA-1 247b5f9a is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1566590

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a2a29a6cb143e0aa4dce3e10f2cbea83a227dc3