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

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



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