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

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

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



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