Merge "Merge "Autobundle all notifications; don\'t leave the most recent one...
Merge "Merge "Autobundle all notifications; don\'t leave the most recent one free." into nyc-dev am: e3e8eeaa am: 5e3c664b" into nyc-mr1-dev-plus-aosp
am: 43602500
* commit '43602500':
Change-Id: I26a3fdab587f61d9f90fe7d4232f6d71dc6ed910