Merge "Fix the multi-user keyguard dialog animation" into tm-dev am:...

Merge "Fix the multi-user keyguard dialog animation" into tm-dev am: 8731db33 am: ba9365b4 am: b808f885 am: 422a48a6

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



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