Merge pull request #3 from CyanogenMod/cm-11.0

1
(cherry picked from commit 40f8842c8adba38846c33b156204c06d8411d6a7)
Merge "move def_lockscreen_targets and def_lockscreen_targets_no_telephony to frameworks/base/packages/SettingsProvider" into cm-11.0
(cherry picked from commit 983e830151e45b004fd9ee91a3d7b5faa1ab3553)