Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Change...

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Change checked state to a filled one" into tm-dev am: 23e31a12

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



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