[automerger skipped] Merge "Add defaults for audio AIDL interfaces" into...

[automerger skipped] Merge "Add defaults for audio AIDL interfaces" into udc-qpr-dev-plus-aosp am: a78b77ed -s ours

am skip reason: Merged-In Ic9d8afc1d4e19e4243c66065b0a5d29156632851 with SHA-1 0d523099 is already in history

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



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