[2/2] Settings: Add options for battery icon in status bar

Change-Id: I5040d1655a13030d67f215dda29230ef34de3e0d

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java