[2/2] SystemUI: Add percent only and none options for battery icon

Part 1: https://gerrit.omnirom.org/#/c/5722/
JIRA: http://jira.omnirom.org/browse/OMNI-574

Change-Id: I3c9c3820389d5073b1fa901cd2008bc685840a63

Conflicts:
	packages/SystemUI/res/layout/quick_settings_tile_battery.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsBasicBatteryTile.java