Merge "Allow some notifications in a group to be muted" into oc-dev
am: 9685128edf

Change-Id: I0a2823475a81c6570c6644153a8f7302dc59b058