Merge "Fix lockscreen anim not running on unlock with FPS" into udc-dev am: 811aeb73 am: 4c099648 am: f3e508d5 am: 89ab2aa7

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



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