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

Change-Id: I9bb87114ef213ce4428126a05b0822bfbe61071c