Fix for SecuritySettings derp

I derped up this one pretty bad... Actually fixed this time + style fixes.
Conflicts:
	src/com/android/settings/SecuritySettings.java
revert
HALO Size (2/2)

Change-Id: I630991372504b152af9dfa063c78c115c79d8c83

Conflicts:
	res/values/pa_strings.xml
	res/xml/pie_settings.xml
	src/com/android/settings/paranoid/Toolbar.java
HALO Size (2/2)

Change-Id: I630991372504b152af9dfa063c78c115c79d8c83