[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher]...

[automerger skipped] DO NOT MERGE: Downbranch merge conflict [Output Switcher] Change checked state to a filled one am: 60cdc0c4 am: 2f2edf7d am: a8a2ba82 am: e978347f -s ours

am skip reason: subject contains skip directive

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



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