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 am: 9a68452c

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



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