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

[automerger skipped] Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Make checkbox disable if a device is not deselectable" into tm-dev am: 4fccafd3 am: 9a68452c am: c6ccf769 am: f7dd48fe -s ours

am skip reason: subject contains skip directive

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



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