Merge "[Output switcher] Fix truncate in landscape mode" into sc-v2-dev am: 6b0d48b8ff am: 67610ea4f9

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

Change-Id: I0c5f24a31926a56d4786dc64947f74703d16ceda