Merge "Add 2 hours as an option for snoozing, update default to 1 hour" into oc-dev
am: 03a243889c

Change-Id: Iab86219c92978c4c37eaafd95800392d5b28bcf5