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

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



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