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

[automerger skipped] Merge "Add defaults for audio AIDL interfaces" into main am: e76315b1 -s ours

am skip reason: Merged-In Ic9d8afc1d4e19e4243c66065b0a5d29156632851 with SHA-1 95732c6c is already in history

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



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