Revert "Status bar Clock and Battery: ERROR"

This reverts commit 96a5a203b9727a2b73aa0b3aeb03442e9d9722e5.
Status bar Clock and Battery: ERROR

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/system_settings.xml

Conflicts:
	res/values/arrays.xml