Merge "Revert "Pass keyguard occluded status in onAnimationCancelled."" into udc-dev