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

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



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