Merge "[User Switcher] Fix wrap method for large..." into tm-qpr-dev am: 6195a5c2 am: 5134d7fd

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



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