Merge "Avoid weird expand animation when a notification is updated" into nyc-mr1-dev
am: c55457b146

Change-Id: I3f14c90f69d9e32c659afb2d9465de6c4752d990