Merge "User switcher dialog morphs again." into tm-qpr-dev am: a24fa798

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



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