Merge "Don't offer snooze for foreground service notifications" into oc-dev