Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected" into tm-dev am: 57fb8fe507
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231937 Change-Id: I9ac24be822a1f121d07bb1a8aff14db356e6aa01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: