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

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



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