Merge "Launch WfcActivation with subscription ID" am: bd57f94a4c

am: 74fe4a9177

Change-Id: Ib61988a9f84ed10d4ac0d6b1a0d8b7d4f8897224

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;
     }