Merge "Avoid weird expand animation when a notification is updated" into...
Merge "Avoid weird expand animation when a notification is updated" into nyc-mr1-dev am: c55457b1 am: 1dfb9c35
am: 50377ebd
Change-Id: I20cfb30818f7e06fc614dae734204db089e530bf