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: 739527c1
* commit '739527c1':
Change-Id: I437e37ca038bfe832a92e4d3ee03d055dba40c18