diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 1c4b1c3..8299d86 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -924,12 +924,9 @@
 
     @Override
     public void overrideConfig(int subscriptionId, PersistableBundle overrides) {
-        // SHELL UID already has MODIFY_PHONE_STATE implicitly so we do not have to check it, but
-        // the API signature explicitly declares that the method caller have MODIFY_PHONE_STATE, so
-        // calling this as well to be safe.
         mContext.enforceCallingOrSelfPermission(
                 android.Manifest.permission.MODIFY_PHONE_STATE, null);
-        TelephonyPermissions.enforceShellOnly(Binder.getCallingUid(), "overrideConfig");
+        //TODO: Also check for SHELL UID to restrict this method to testing only (b/131326259)
         int phoneId = SubscriptionManager.getPhoneId(subscriptionId);
         if (!SubscriptionManager.isValidPhoneId(phoneId)) {
             log("Ignore invalid phoneId: " + phoneId + " for subId: " + subscriptionId);