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

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



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