Merge "Merge "Fix lockscreen anim not running on unlock with FPS" into udc-dev...

Merge "Merge "Fix lockscreen anim not running on unlock with FPS" into udc-dev am: 811aeb73 am: 4c099648 am: 8ec2a92f" into udc-qpr-dev-plus-aosp am: 5fc70d6e

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



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