Merge cherrypicks of ['googleplex-android-review.googlesource.com/36308769', 'googleplex-android-review.googlesource.com/36787311'] into 25Q4-release.

Change-Id: I57f15ffdab30b5b01c669207af7c6aa3f64a687a

diff --git a/tests/framework/base/biometrics/src/android/server/biometrics/BiometricPromptFallbackOptionsTest.java b/tests/framework/base/biometrics/src/android/server/biometrics/BiometricPromptFallbackOptionsTest.java
index 8918dd69..08a6ed06 100644
--- a/tests/framework/base/biometrics/src/android/server/biometrics/BiometricPromptFallbackOptionsTest.java
+++ b/tests/framework/base/biometrics/src/android/server/biometrics/BiometricPromptFallbackOptionsTest.java

@@ -25,6 +25,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 import static org.mockito.Mockito.any;
@@ -497,7 +498,7 @@
                 "android.hardware.biometrics.BiometricPrompt#getMaxFallbackOptions"
             })
     @RequiresFlagsEnabled({Flags.FLAG_BP_FALLBACK_OPTIONS, Flags.FLAG_ADD_FALLBACK})
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testFallbackOptions_exceedsMaxOptions() throws Exception {
         for (SensorProperties props : mSensorProperties) {
             if (props.getSensorStrength() == SensorProperties.STRENGTH_CONVENIENCE) {
@@ -520,10 +521,15 @@
                                 .setConfirmationRequired(true)
                                 .setAllowBackgroundAuthentication(true);
 
-                // Add 1 more than max fallback options
-                for (int i = 0; i < BiometricPrompt.getMaxFallbackOptions() + 1; i++) {
-                    builder.addFallbackOption("fallback " + i, 0, executor, (dialog, which) -> {});
-                }
+                assertThrows(
+                        IllegalArgumentException.class,
+                        () -> {
+                            // Add 1 more than max fallback options
+                            for (int i = 0; i < BiometricPrompt.getMaxFallbackOptions() + 1; i++) {
+                                builder.addFallbackOption(
+                                        "fallback " + i, 0, executor, (dialog, which) -> {});
+                            }
+                        });
             }
         }
     }

diff --git a/tests/tests/telephony/current/src/android/telephony/satellite/cts/SatelliteManagerTestOnMockService.java b/tests/tests/telephony/current/src/android/telephony/satellite/cts/SatelliteManagerTestOnMockService.java
index 7d58527..1f7d5c0 100644
--- a/tests/tests/telephony/current/src/android/telephony/satellite/cts/SatelliteManagerTestOnMockService.java
+++ b/tests/tests/telephony/current/src/android/telephony/satellite/cts/SatelliteManagerTestOnMockService.java

@@ -279,10 +279,6 @@
             sInitError = new AssertionError("enforceMockModemDeveloperSetting failed", e);
             return;
         }
-        setUpNtnOnlyTestEnvironment(
-            NTN_ONLY_SLOT_ID, NTN_ONLY_SIM_PROFILE_ID, NTN_ONLY_PHONE_NUMBER);
-        sNtnOnlySubId = SubscriptionManager.getSubscriptionId(NTN_ONLY_SLOT_ID);
-        assumeTrue(sNtnOnlySubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID);
 
         grantSatellitePermission();
         try {
@@ -294,6 +290,11 @@
         sMockSatelliteServiceManager.setSupportedRadioTechnologies(
             new int[]{NTRadioTechnology.PROPRIETARY});
 
+        setUpNtnOnlyTestEnvironment(
+            NTN_ONLY_SLOT_ID, NTN_ONLY_SIM_PROFILE_ID, NTN_ONLY_PHONE_NUMBER);
+        sNtnOnlySubId = SubscriptionManager.getSubscriptionId(NTN_ONLY_SLOT_ID);
+        assumeTrue(sNtnOnlySubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
         // Enable CTS mode to ignore the requests from SG-APK and real Pointing UI app.
         assertTrue(sMockSatelliteServiceManager.setCtsMode(true));
         sMockSatelliteServiceManager.setDatagramControllerBooleanConfig(false,