Merge "Ensure end action is called if keyguard animation is cancelled" into sc-v2-dev am: 517f6aedc1

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

Change-Id: Iffbb13f1b57037a5d8e5395ba1b4720052942aba