Merge "Settings: Only disable menu unlock options with custom keyguard" into cm-11.0

(cherry picked from commit e08bfc517b62826c2679795eaf64da7fa16f3097)

Conflicts:
	src/com/android/settings/cyanogenmod/LockscreenButtons.java