Merge "Change snoozing behavior for notifications in groups" into oc-dev
am: ad9412cf8a

Change-Id: I548d7e648de5ea8ec8234418d1c06f47f4e40697