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

Conflicts:
	res/values/custom_strings.xml
	res/xml/security_settings_slide_delay_custom.xml
	src/com/android/settings/SecuritySettings.java
[2/2] Settings: Wakelock Blocker

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

Change-Id: Ia0f787121286b579795da571ba957064002abfa7