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: 7c55257b
* commit '7c55257b':
Change-Id: I6157d4f5eaae18252557e21e8019b656d9a02e2b