[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 am: 2395a5ff -s ours am: 71afecfc -s ours

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

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



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