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: 8c6b2a75 am: cfc54f96

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



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