am 9ebb030a: am e5129d7f: Merge "Defer adding large icon until when we compose the final notification. (Bug 5566846)" into ics-mr1

* commit '9ebb030ad9eeb94bdf9e15b7a3f55d9792dda96b':
  Defer adding large icon until when we compose the final notification. (Bug 5566846)