Frameworks: option to hide the battery icon (1/2)

Change-Id: I82748d4dbdcb2b1c07ec00e43239f64a412b014c

Conflicts:
	core/java/android/provider/Settings.java