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

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

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

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