[2/2] Add battery level around unlock ring

Change-Id: Id594d7535aff99ab2712e8d6c9645330ca29e721

Conflicts:

	res/values/strings.xml
	res/xml/lock_screen_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java