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: 497d3dda am: 7f738a75" into tm-qpr-dev-plus-aosp am: 526102be

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



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