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

Change-Id: I01642425595d8216066a7761cdf6b8885fbed9e5
Cleanup battery style code

Change-Id: I50c347af17ce0ddef1f887586d0aca54843b8e63
Merge branch 'remote' into mkl

Conflicts:
	src/com/android/settings/cyanogenmod/StatusBarSettings.java

Change-Id: I549ad0bafd15881f41e92e5ebf0abc2278eae657