Add battery level around unlock ring…

[1/2] [log]

Change-Id: I8447e76b31c6ef00084c6c1b421f75a2e73f911b

Conflicts:
	core/java/android/provider/Settings.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java