Settings: Fix missing preference when lockscreen disabled.

    - Introduced in security settings reshuffle.

Change-Id: I1b6b608682208396d5efc54fd985652f65e86ffc
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Settings : Launch only contacts picker for blacklist entry

Change-Id: I266d1ad7f1aab745728b33490268cb197188f2b3
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge branch 'cm-11.0' of https://github.com/androidarmv6/android_packages_apps_Settings into cm-11.0