[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: 9033943c -s ours am: 3a118cc2 -s ours

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

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



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