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

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



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