[automerger skipped] Merge "Ensure end action is called if keyguard animation is cancelled" into sc-qpr1-dev am: 43ded012fb am: f8e333d96f -s ours am: 44d736c66c -s ours
am skip reason: Merged-In I9984863d0acea1265d09dfcfac22d5e78c73a1fe with SHA-1 8a7b6945da is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16174752
Change-Id: I18bcb5466675b117e8a8484cd71dfceca17cb4cd
This commit is contained in: