Merge "Fix not delivering result to fragment using SubSettingLauncher"

src/com/android/settings/core/SubSettingLauncher.java

@@ -164,7 +164,7 @@ public class SubSettingLauncher {
     }
 
     private void launchForResult(Fragment listener, Intent intent, int requestCode) {
-        listener.getActivity().startActivityForResult(intent, requestCode);
+        listener.startActivityForResult(intent, requestCode);
     }
 
     /**