Snap for 13259233 from c7d2bc8cb4 to 25Q2-release

Change-Id: Ife57419a3417ee6028c8c3e6a62026d0160963e8

src/com/android/settings/development/OemUnlockPreferenceController.java

@@ -236,7 +236,13 @@ public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceCon
 
     @VisibleForTesting
     boolean isOemUnlockedAllowed() {
+        try {
             return mOemLockManager.isOemUnlockAllowed();
+        } catch (SecurityException e) {
+            // This exception is thrown if the device is not allowed to check (or change) the OEM
+            // unlock setting because Factory Reset Protection is active.
+            Log.e(TAG, "Failed to check OEM unlock allowed", e);
+            return false;
+        }
     }
-
 }

tests/Enable16KbTests/test_16kb_app/src/com/android/settings/development/test/Enable16KbDeviceTest.java

@@ -41,7 +41,7 @@ import java.util.Locale;
 
 @RunWith(AndroidJUnit4.class)
 public class Enable16KbDeviceTest {
-    private static final long TIMEOUT = 2000;
+    private static final long TIMEOUT = 3000;
 
     private static final String ENABLE_16K_TOGGLE = "Boot with 16 KB page size";
     private static final String BUILD_NUMBER = "Build number";