Merge "Don't offer snooze for foreground service notifications" into oc-dev am: 8f395a16fb
am: cb5b58d990

Change-Id: If20d6cef28c3b79fe4577b0ea82fb6479a8dc163