Merge "move def_lockscreen_targets and def_lockscreen_targets_no_telephony to frameworks/base/packages/SettingsProvider" into cm-11.0