Revert^2 "Prevent notif flicker during entirety of swipe to unlock"

This reverts commit c353b7a1eb8720ede35b6f12175742f3ed9142c3.

Reason for revert: Raced with tsuji's CL. Will fix the broken test

Change-Id: I4eb407c1ac2e2fa3bafa0d8639d07b313a9da746
9 files changed