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

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



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