Revert "NotificationWrappers: Factor out doze treatment"

Bug: 36430936
This reverts commit edfb65bbc4eb0453c91355c9c2277fe5e96b135b.

Change-Id: I85f67d2f703bdc1bb8f2bedc19eacb5320b3c1d3
6 files changed