Revert "SystemUI: fix double tap to sleep not working with secure lock screen"

This reverts commit 7e7f606626b7827beeef47dc598c158749422265.
Revert "PhoneStatusBar: Readd headsup view when theme change occurs."

This reverts commit c9069449412a6f29d5e772c6fd4b187f854a1214.