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)

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