Settings: Lockscreen Shake Security && Timer (2/2)

Change-Id: I4d1be0254d5bc4befa85da36ac81cea8ca1857d1

Conflicts:
	res/values/pac_arrays.xml
	res/values/pac_strings.xml
	res/xml/security_settings_biometric_weak.xml
	res/xml/security_settings_pattern.xml
	res/xml/security_settings_pin.xml
	src/com/android/settings/SecuritySettings.java