Merge "Launch WfcActivation with subscription ID"

am: bd57f94a4c

Change-Id: Id76cb09a81158ce069f5200b99c19b1c9840f9f8

src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java

@@ -398,6 +398,7 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
         // Build and return intent
         Intent intent = new Intent();
         intent.setComponent(componentName);
+        intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, mSubId);
         return intent;
     }