Merge "move def_lockscreen_targets and def_lockscreen_targets_no_telephony to frameworks/base/packages/SettingsProvider" into cm-11.0
(cherry picked from commit 77ce5ff65aeff5c8b96d78392c21ca06b0b74df1)
Merge "MSimNetworkController: Set debug to false." into cm-11.0
(cherry picked from commit 7154b64724aa18ad057be84f339916be7b5a0618)