Merge "Update NotificationRecord of snooze even after it is cancelled"
am: 10f4d427cd

Change-Id: Ibd4367f14ee326acfba3bb54ee701e8b0265aebf