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

Change-Id: Ia3b42b26c3bfe025cf50f1416d1bbf112c07f8a2