Merge changes Ic359aaee,Id7aba066

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