[automerger skipped] Merge "Migrate av-audio-types-aidl to audio core V3" into...

[automerger skipped] Merge "Migrate av-audio-types-aidl to audio core V3" into main am: ddc2de8f am: f2239e16 -s ours

am skip reason: Merged-In Ib96136ed21a13ec749ae5b7cb0f6b354b9a7b92f with SHA-1 32792cb4 is already in history

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



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