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

Change-Id: Id97abfaed8e517b40a4d709866e88e8099787dbf