[automerger skipped] Merge "Fix stuck unlock animation state" into udc-d1-dev...

[automerger skipped] Merge "Fix stuck unlock animation state" into udc-d1-dev am: d5d10af4 -s ours am: 59b512e2 -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: I42415c5b49af8391acb35885265dd79738de690d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>