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: dd6e433c am: 37a478bd am: bb2cb3e4

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



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