Merge "Fix stuck unlock animation state" into udc-qpr-dev am: 7be94b817a

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

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