Merge "Fix lockscreen anim not running on unlock with FPS" into udc-dev am: 811aeb73

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



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