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

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



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