Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064409

Change-Id: I0737e21c4a5939de394c418cb9261a52a3f5df86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/network/UiccSlotUtil.java

@@ -369,6 +369,7 @@ public class UiccSlotUtil {
                     }
                     return true;
                 })
+                .sorted(Comparator.comparingInt(UiccSlotMapping::getLogicalSlotIndex))
                 .mapToInt(uiccSlotMapping -> uiccSlotMapping.getLogicalSlotIndex())
                 .findFirst()
                 .orElse(INVALID_LOGICAL_SLOT_ID);