Settings : Filter spam notifications

Change-Id: I4056aceada3cf8397827037bcb52388de9f8b9fc
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Highlight all search matches for the given constraint.

Change-Id: I9f1a58ee3e6cd59522c4705bedb1457473201d3c
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge branch 'androidarmv6/cm-11.0'