Merge "Merge "Fixed a bug where notifications could overlap" into nyc-dev am:...
Merge "Merge "Fixed a bug where notifications could overlap" into nyc-dev am: 33e2fc48 am: 53405ffa" into nyc-mr1-dev-plus-aosp
am: 7f411973
* commit '7f411973':
Change-Id: Id7b71fa840a511e78e6f05051d76d66184782538