Merge "Run unlock animation when device is already unlocked" into tm-dev am: e16348eb

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



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