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

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

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



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