[1/2] settings: Set AdvancedReboot to be enabled by default
RE: http://jira.omnirom.org/browse/OMNI-1

Fixing as I am a stupid head

Edit 9001: Setting this to be enabled by default for all users

Change-Id: I08a0e0cbe821e4d2dad6cf2a9ac20721cd19d69b
Settings: Security: implement a pin keypad shuffler [2/2]

Change-Id: I225af5654c440aa16964df3257130febec6ef275
Merge "[1/2] settings: Set AdvancedReboot to be enabled by default RE: http://jira.omnirom.org/browse/OMNI-1" into android-4.4
Merge branch 'android-4.4' of https://github.com/omnirom/android_packages_apps_Settings into test

Signed-off-by: Kristofer Ard <kristoferard@gmail.com>

Conflicts:
	res/values/custom_strings.xml