Settings : Filter spam notifications

Change-Id: I4056aceada3cf8397827037bcb52388de9f8b9fc
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0-sgt7

Conflicts:
	AndroidManifest.xml
	res/values/cm_strings.xml