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

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



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