[automerger skipped] Merge "Ensure end action is called if keyguard animation is cancelled" into sc-qpr1-dev am: 43ded012 -s ours

am skip reason: Merged-In I9984863d0acea1265d09dfcfac22d5e78c73a1fe with SHA-1 8a7b6945 is already in history

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

Change-Id: Ic0b05d1b0c584bf0ceeb46f64afec16d370b2988