Merge "[Output Switcher] Fix layout for ongoing session" into udc-dev am: d5598c4b

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



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