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

[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected am: 94280acc am: dbf7d03b am: 5f84977c am: 6aa55fac -s ours

am skip reason: subject contains skip directive

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



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