Lockscreen Notifications

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

Conflicts:
	res/values/ose_dimens.xml
	res/values/ose_strings.xml
	res/xml/security_settings_biometric_weak.xml
	res/xml/security_settings_lockscreen.xml
	res/xml/security_settings_password.xml
	res/xml/security_settings_pattern.xml
	res/xml/security_settings_pin.xml

Conflicts:
	res/values/ose_strings.xml
	res/xml/security_settings_biometric_weak.xml
	res/xml/security_settings_chooser.xml
	res/xml/security_settings_lockscreen.xml
	res/xml/security_settings_password.xml
	res/xml/security_settings_pattern.xml
	res/xml/security_settings_pin.xml