Revert "[1/2] Add battery level around unlock ring"

This reverts commit 444c74356a3520ce82c94412d433f52b1004ac79.

Conflicts:

	core/java/android/provider/Settings.java
	packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java