Merge "[Output Swithcer] Fix deeplink and disable single device layout" into udc-dev am: 7a64585e am: c6da2bd2

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



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