Merge "Merge "[Output Switcher] Handle muting expected device" into tm-dev am:...

Merge "Merge "[Output Switcher] Handle muting expected device" into tm-dev am: 1ad92562 am: 1a4e9421" into tm-d1-dev-plus-aosp am: 30598c8a

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



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