Lockscreen Notifications

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