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

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