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: 4ea68197 am: db1bd088 am: 1e82ae1d

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



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