[automerger skipped] Merge "AudioFlinger: Add IAfPatchPanel interface" into...

[automerger skipped] Merge "AudioFlinger: Add IAfPatchPanel interface" into udc-dev-plus-aosp am: 7f89c9fb am: 85a2d16e -s ours

am skip reason: Merged-In I57b64268d95621a694d12bf347adc195570cab65 with SHA-1 d25fe399 is already in history

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



Change-Id: I48af72bcc5663ae68ef7b7520861657b00a2579b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>