Merge "Notification: Reuse drawable in Header if Icon unchanged" into nyc-mr1-dev am: d4a95806ab
am: 6c682c5926

Change-Id: I5e2b6e0fb61818bdbcb8d0a97c772c5a3dcbc546