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: 7f10013b am: 9699c184 am: 4b0d2ba9

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



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