DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark...

DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected am: 94280acc

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



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