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

This reverts commit 152ad993a79d011960c60311003506d433783cab.

Conflicts:
	res/values/illusion_strings.xml

Change-Id: I1cdd23467066a30310b2c9f3d92df74d5bb3bdf0