DO NOT MERGE: Downbranch merge conflict [Output Switcher] Change checked state to a filled one am: 60cdc0c4 am: 2f2edf7d am: 707cb798

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



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