Circle battery

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

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

Conflicts:
	core/java/android/provider/Settings.java
Move status bar native battery percentage into status bar battery style

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/BatteryMeterView.java

Conflicts:
	core/java/android/provider/Settings.java
Quick settings battery tile: hide battery percentage if enabled in status bar batter style