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

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



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