[automerger skipped] Merge "Add audio device type MULTICHANNEL_GROUP" into...

[automerger skipped] Merge "Add audio device type MULTICHANNEL_GROUP" into main am: 105003fc am: 19fb6b29 -s ours

am skip reason: Merged-In I9a86bad61c350054fef883670c17509b07300ec8 with SHA-1 4c2a1c2e is already in history

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



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