Merge \"Snooze schedule rules that were canceled by alarms.\" into nyc-mr1-dev
am: ae0aed951b

Change-Id: I18bd8e7528a6c24f350c97268b26fe91ef198290