tree 3272200690674c8535c97eb6f3e5020af019d940
parent ecc7a93657b4b5cca93855380eed95baac379034
parent 44d736c66ce076bab47c74510affb95dd05a9d74
author TreeHugger Robot <treehugger-gerrit@google.com> 1635870156 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635870156 +0000

[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