Settings: Add Advanced reboot [2/2]

Change-Id: I59690daf92514dff10543171bb3eba435fa216e5
Signed-off-by: cj360 <ayunker551@gmail.com>

Conflicts:
	res/values/slim_arrays.xml
	res/values/slim_strings.xml
	src/com/android/settings/SecuritySettings.java
Revert "Settings: add "advanced" menu to Display/TapToWake"

This reverts commit fa2fbf93c2ee6a57dcf9a9a1800a6e37b4768245.

Signed-off-by: cj360 <ayunker551@gmail.com>

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/cyanogenmod/BootReceiver.java

Change-Id: I6dd0c4df16f06d84677afe81cfe4c2014b270d58