Merge changes from topic 'revert_dozing'

* changes:
  Revert "NotificationWrappers: Factor out doze treatment"
  Revert "AOD: Use color filter to invert icons for AOD"