Merge "[User Switcher] Change layout of menu." into tm-qpr-dev am: d0249dc5

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



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