Merge changes I0d3c2163,I5602713b,Ica2a26ea into main

* changes:
  Fix PrimarySim show the same sim in the preference list
  Start simOnboarding when active sim > 0
  [SimOnbarding] correct the sim name at the Primary Sim

src/com/android/settings/spa/network/SimOnboardingPageProvider.kt

@@ -24,6 +24,7 @@ import android.os.Bundle
 import android.util.Log
 import androidx.annotation.VisibleForTesting
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.NavHostController
 import androidx.navigation.NavType
@@ -101,10 +102,13 @@ fun PageImpl(onboardingService:SimOnboardingService,navHostController: NavHostCo
     ) {
         composable(route = SimOnboardingScreen.LabelSim.name) {
             val nextPage =
-                if (onboardingService.isMultipleEnabledProfilesSupported && onboardingService.isAllOfSlotAssigned) {
+                if (onboardingService.isMultipleEnabledProfilesSupported
+                            && onboardingService.isAllOfSlotAssigned) {
                     SimOnboardingScreen.SelectSim.name
                 } else {
-                    onboardingService.addCurrentItemForSelectedSim()
+                    LaunchedEffect(Unit) {
+                        onboardingService.addCurrentItemForSelectedSim()
+                    }
                     SimOnboardingScreen.PrimarySim.name
                 }
             SimOnboardingLabelSimImpl(

src/com/android/settings/spa/network/SimOnboardingPrimarySim.kt

@@ -77,7 +77,8 @@ fun SimOnboardingPrimarySimImpl(
             SettingsBody(stringResource(id = R.string.sim_onboarding_primary_sim_msg))
         }
 
-        var selectedSubscriptionInfoList = onboardingService.getSelectedSubscriptionInfoList()
+        var selectedSubscriptionInfoList =
+                onboardingService.getSelectedSubscriptionInfoListWithRenaming()
         callsSelectedId.intValue = onboardingService.targetPrimarySimCalls
         textsSelectedId.intValue = onboardingService.targetPrimarySimTexts
         mobileDataSelectedId.intValue = onboardingService.targetPrimarySimMobileData