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

am skip reason: Merged-In Ic9d8afc1d4e19e4243c66065b0a5d29156632851 with SHA-1 6f1af8f9f7 is already in history

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

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