Revert "[2/2] Settings: Optional statusbar battery icons"

This reverts commit 6de3e50802b7bb5418cfe9a0ff910e57437e0774.

Conflicts:
	res/values/custom_strings.xml

Change-Id: I03b8f3bf84e10c2eb7fb691780c894a35b19dc92