Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] fix checkbox...

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] fix checkbox not show" into tm-dev am: e48d4958 am: 508c6c46

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



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