Merge "[Output Swithcer] Fix deeplink and disable single device layout" into...

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

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



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