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

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



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