diff --git a/res/values/evolution_strings.xml b/res/values/evolution_strings.xml
index 051c6ee0c59..fa25d9f0158 100644
--- a/res/values/evolution_strings.xml
+++ b/res/values/evolution_strings.xml
@@ -432,4 +432,8 @@
 
     <!-- Confirm dialog -->
     <string name="confirm_before_enable_title">Continue to enable?</string>
+
+    <!-- Override Mock Location restriction -->
+    <string name="override_mock_location_title">Override MockLocation restriction</string>
+    <string name="override_mock_location_summary">When enabled, apps cannot detect mock locations</string>
 </resources>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 0ba5da8fc97..82bcf6d7a8a 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -41,6 +41,14 @@
         android:summary="@string/assisted_gps_summary"
         settings:controller="com.android.settings.location.AgpsPreferenceController"/>
 
+    <SwitchPreferenceCompat
+        android:key="override_mock_location"
+        android:title="@string/override_mock_location_title"
+        android:summaryOn="Mock locations are hidden from apps"
+        android:summaryOff="Apps can detect mock locations"
+        android:defaultValue="false"
+        settings:controller="com.android.settings.location.OverrideMockLocationPreferenceController" />
+
     <PreferenceCategory
         android:key="location_advanced_settings"
         android:layout="@layout/preference_category_no_label">
diff --git a/src/com/android/settings/location/OverrideMockLocationPreferenceController.java b/src/com/android/settings/location/OverrideMockLocationPreferenceController.java
new file mode 100644
index 00000000000..cf2c0a051c6
--- /dev/null
+++ b/src/com/android/settings/location/OverrideMockLocationPreferenceController.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.location;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreferenceCompat;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+/**
+ * Controller for the "Override MockLocation restriction" toggle in More security settings.
+ * This toggle controls whether apps can detect mock locations through isMock() and 
+ * isFromMockProvider() APIs.
+ */
+public class OverrideMockLocationPreferenceController extends BasePreferenceController
+        implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume {
+
+    private static final String KEY_OVERRIDE_MOCK_LOCATION = "override_mock_location";
+    private static final String PROPERTY_OVERRIDE_MOCK = "persist.sys.override_mock_location";
+
+    private SwitchPreferenceCompat mPreference;
+
+    public OverrideMockLocationPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        // Always available in More security settings
+        return AVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+        if (mPreference != null) {
+            updateState();
+        }
+    }
+
+    @Override
+    public void onResume() {
+        updateState();
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final boolean isEnabled = (Boolean) newValue;
+        
+        // Set the system property based on toggle state
+        SystemProperties.set(PROPERTY_OVERRIDE_MOCK, isEnabled ? "true" : "false");
+        
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateState();
+    }
+
+    private void updateState() {
+        if (mPreference != null) {
+            // Get current state from system property
+            final boolean enabled = SystemProperties.getBoolean(PROPERTY_OVERRIDE_MOCK, false);
+            mPreference.setChecked(enabled);
+        }
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_OVERRIDE_MOCK_LOCATION;
+    }
+}