Settings: Add cLock settings back to lockscreen settings

Change-Id: I00153e63e39e312b5ff097a4e651f2bbf33d7b4b
Merge "Settings: Add cLock settings back to lockscreen settings" into cm-11.0
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_packages_apps_Settings into cd-4.4