ProximityWake: Fix and bring inline with CM

Change-Id: I4361da44fbc0ee46862453d650cd16c440781011
Filter spam notifications

Change-Id: Ibf2377cd7491c7e0e9e9c9657e9e65eef1876ee3

Conflicts:
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/menu/notification_popup_menu.xml
	packages/SystemUI/res/values/cm_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	services/java/com/android/server/NotificationManagerService.java