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

Change-Id: If2ba099e67ccdabf756a62858a5244679f9c1547