Merge "audio: toggle hdmitx/hdmiarc when switch surround mode" into main am: ff8c3e069d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3192271

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