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

[automerger skipped] Merge "Add audio device type MULTICHANNEL_GROUP" into main am: 8ca47767 am: 09312f98 -s ours

am skip reason: Merged-In If9ad55bd991f060c308dd128be489b51557a99e3 with SHA-1 a2d41f83 is already in history

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



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