Have SecuritySettings and SoundSettings use getCurrentPhoneType

To preserve proper behavior now that getPhoneType can return
PHONE_TYPE_NONE use getCurrentPhoneType.

bug: 3198435
Change-Id: I39d385b17d746f3c7cdbc3e1869efa5d4e89230c

src/com/android/settings/SecuritySettings.java

@@ -225,7 +225,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
         addPreferencesFromResource(R.xml.security_settings_misc);
 
         // Do not display SIM lock for CDMA phone
-        if (TelephonyManager.PHONE_TYPE_CDMA == TelephonyManager.getDefault().getPhoneType()) {
+        if (TelephonyManager.PHONE_TYPE_CDMA ==
+                TelephonyManager.getDefault().getCurrentPhoneType()) {
             root.removePreference(root.findPreference(KEY_SIM_LOCK));
         }