Merge "Launch WfcActivation with subscription ID" am: bd57f94a4c am: 74fe4a9177

am: 4f2055500a

Change-Id: I326052d639276b89859770fbe110a73f80c4a9fc

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

@@ -401,6 +401,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;
     }