Merge "DO NOT MERGE: Downbranch merge conflict[Output Switcher] Add support...

Merge "DO NOT MERGE: Downbranch merge conflict[Output Switcher] Add support for device disabled reason" into tm-qpr-dev am: d595241f

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



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