Settings: remove misplaced "Filter Notif" setting under Battery Saver

Change-Id: I01642425595d8216066a7761cdf6b8885fbed9e5
(cherry picked from commit a9c50e58bfe417d6adc985eae11bc42b6fb9cfac)
Cleanup battery style code

Change-Id: I50c347af17ce0ddef1f887586d0aca54843b8e63
(cherry picked from commit 0a10a1a85e0db78b271fcc3624c28589c43218dd)

Conflicts:
	res/xml/status_bar_settings.xml
	src/com/android/settings/cyanogenmod/StatusBarSettings.java