[automerger skipped] Fix stuck unlock animation state am: 827521fe -s ours...

[automerger skipped] Fix stuck unlock animation state am: 827521fe -s ours am: 2e5d8245 -s ours am: 96ea4857 -s ours

am skip reason: Merged-In I762853d930f02ab0ee7f8cf0216b5aa6d01cf38c with SHA-1 aed9df4b is already in history

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



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