Settings: Move vibrate on unlock to the Screen security section

The Vibrate on unlock setting was merged in the wrong location in
Settings.  This commit moves it to the appropriate place.

Change-Id: I77ba7dba442363f4c91b76d0a6d75bd754103a93

Conflicts:
	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java