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

[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Change checked state to a filled one" into tm-dev am: 23e31a12 am: 4ceab5c5 am: fe8d9ad3 am: 581302c3 -s ours

am skip reason: subject contains skip directive

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



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