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

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



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