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 am: 3012633b

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



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