Merge "Moved a few telephony settings from Secure to Global" into jb-mr1-dev