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

[automerger skipped] Merge "Fix stuck unlock animation state" into udc-qpr-dev am: 7be94b81 am: 41b0f4c4 -s ours

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

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



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