[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict[Output...

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

am skip reason: subject contains skip directive

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



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