[automerger skipped] Merge "Revert "Pass keyguard occluded status in...

[automerger skipped] Merge "Revert "Pass keyguard occluded status in onAnimationCancelled."" into udc-dev am: 744c5eee am: ff0ac55c -s ours

am skip reason: Merged-In I972d5b80f202b9b6a645fc70b992f6b2141cbc20 with SHA-1 3859e5c4 is already in history

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



Change-Id: If7ce82a4132504a768e27102ccf6992b83b5a276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>