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

Change-Id: I5320868dd605bca45838cc8b32c0789e0bb60106