Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make checkbox...

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make checkbox disable if a device is not deselectable" into tm-dev am: 4fccafd3

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



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