Add battery level around unlock ring

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