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

DO NOT MERGE: Downbranch merge conflict[Output Switcher] Add support for device disabled reason am: 63e26b3c

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



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