move def_lockscreen_targets and def_lockscreen_targets_no_telephony to frameworks/base/packages/SettingsProvider

Change-Id: I888f24cdce187b9b285c6efc47a59829051686fd
Merge "move def_lockscreen_targets and def_lockscreen_targets_no_telephony to frameworks/base/packages/SettingsProvider" into cm-11.0
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_vendor_cm into cm-11.0

Conflicts:
	overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml