[automerger skipped] Merge "Add 'defaults' for 'av-audio-types-aidl'" into...

[automerger skipped] Merge "Add 'defaults' for 'av-audio-types-aidl'" into main am: 0a134a19 am: f03e0cef -s ours

am skip reason: Merged-In If4cd909dda7ec5cf0432e36074950b5b7e387fdd with SHA-1 dd1b47fd is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3092703



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