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

Change-Id: I363a606d1f190c2da6cc8fbd76ef0b093efa0a58