Merge "Improve animation from keyguard shortcut" into tm-qpr-dev am: 3d5c9f00 am: 28df4c7a

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



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