Merge "Merge "Run unlock animation on MODE_ONLY_WAKE" into tm-dev am:...

Merge "Merge "Run unlock animation on MODE_ONLY_WAKE" into tm-dev am: e196a94c am: 37a6f17a am: d98578c1" into tm-qpr-dev-plus-aosp am: ac5063e8

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



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