Merge "[Output Switcher] Not add "Connect a device" option when output is...

Merge "[Output Switcher] Not add "Connect a device" option when output is remote" into udc-dev am: 2a6e68c1 am: 2cf07fd9

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



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