Merge "Ensure end action is called if keyguard animation is cancelled" into...

Merge "Ensure end action is called if keyguard animation is cancelled" into sc-qpr1-dev am: 43ded012

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

Change-Id: I6869cd8b2faf91c9de61b0771380b38e3b9e3cb2