Revert "Derp"

This reverts commit 3bb47bb985622863dd179a55dbd58e901a1e3968.
Revert "Add battery level text to status bar (2/2)"

This reverts commit dfbdb1c2162ef22013342277abc10759160782af.

Conflicts:
	res/xml/status_bar_settings.xml
	src/com/android/settings/StatusBarSettings.java
Add battery level text to status bar (2/2)

1. Remove battery level toggle from Date/Time settings.
2. Add "Status Bar" settings entry with battery level setting.

Change-Id: I8194354f7ebdaf14cb1754c6e5d741053d20000e

Conflicts:
	res/values/cm_strings.xml
	res/xml/dashboard_categories.xml
	src/com/android/settings/DateTimeSettings.java
Fix Battery % settings