am 235a6911: am 714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev

* commit '235a6911b0939adc598e4135e1f1c6fcda9ff169':
  Ambient display now comes up immediately when a notification comes in