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: I52ceb79c89f3c0671bd0a6db531d2f294093ce38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>