Merge "Donot disable Wi-Fi Calling when getting "registration error" intent."

src/com/android/settings/WifiCallingSettings.java

@@ -193,9 +193,6 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
                 // not show notification, we are changing result code here.
                 setResultCode(Activity.RESULT_CANCELED);
 
-                // UX requirement is to disable WFC in case of "permanent" registration failures.
-                mSwitch.setChecked(false);
-
                 showAlert(intent);
             }
         }