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

[automerger skipped] Merge "Add defaults for audio AIDL interfaces" into aosp-main-future am: ca63a366 -s ours am: 0134201e -s ours

am skip reason: Merged-In Ic9d8afc1d4e19e4243c66065b0a5d29156632851 with SHA-1 1977a4a6 is already in history

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



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