Merge "[Output Switcher] Support ongoing session for active device" into...

Merge "[Output Switcher] Support ongoing session for active device" into udc-dev am: 1879dc61 am: 705e962f

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



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