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

[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Don't show checkmark when only a device connected" into tm-dev am: 57fb8fe5 am: 56a4a118 am: fbcaaf44 am: 26e06b73 -s ours

am skip reason: subject contains skip directive

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



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