Merge "Improve animation from keyguard shortcut" into tm-qpr-dev am: 3d5c9f008e

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

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