Proximity Wake-Up : adjust strings

Change-Id: I605a11b5bd7150b2a456d5c355af49fd7047e173
Add summary to notification filtering

Change-Id: Ie02165f72e67b2fc6aa086de61303a53a7ee4470
Merge branch 'cm-11.0' of https://github.com/temasek/android_packages_apps_Settings into HEAD