status bar battery percentage: option for percentage inside icon

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