Merge remote-tracking branch 'slim/kk4.4' into ose

Conflicts:
	res/values/ose_arrays.xml
	res/xml/ose_navigation_settings.xml
	res/xml/security_settings_biometric_weak.xml
	res/xml/security_settings_chooser.xml
	res/xml/security_settings_password.xml
	res/xml/security_settings_pattern.xml
	res/xml/security_settings_pin.xml
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/Settings.java
	src/com/android/settings/accessibility/AccessibilitySettings.java
	src/com/android/settings/ose/quicksettings/QuickSettingsUtil.java