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

Change-Id: I1fd1a342e6e5933bbe084293f4d1f5b27ede43da