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 am: dbf7d03b am: 5f84977c

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



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