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

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected" into tm-dev am: 57fb8fe5 am: ab8b3009

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



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