[2/2] Settings: Add lockscreen ring battery setting

Change-Id: Ia07ecc1feedee71b8ea217c53244fdef9ff1bc18

Conflicts:
	res/values/custom_strings.xml
Update custom_strings.xml

fixed it. submitting
Merge pull request #2 from BladeZero/patch-2

Update custom_strings.xml
Merge pull request #3 from VlikeBanana/4.4

Add Battery on Lockscreen + Fixes