Settings: Lockscreen Shake Security Timer (2/2)

PS2: Derp

Change-Id: I16de5d413227614e27fe1eaca9f2290b080d4bc4

Conflicts:
	res/xml/security_settings_biometric_weak.xml
	src/com/android/settings/SecuritySettings.java