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

* commit '714a61cd586c789b18acfd0567cfea2b4ea170dd':
  Ambient display now comes up immediately when a notification comes in