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

Merge "Run unlock animation when device is already unlocked" into tm-dev am: e16348eb am: 2bf5f9d9 am: 8b58a199 am: 5701908f

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



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