Merge "Do not unsnooze canceled notifications." into oc-dev am: 8183328af7
am: e53ae6aa23

Change-Id: Ie75b1d98124935c7575665dd85f1efa81e86a8f3