DO NOT MERGE: Downbranch merge conflict [Output Switcher] Change checked state...

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

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



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