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