diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index def0075ed7b..72855f0dc82 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -275,6 +275,11 @@
             android:title="@string/wifi_scan_throttling"
             android:summary="@string/wifi_scan_throttling_summary" />
 
+        <SwitchPreference
+            android:key="wifi_enhanced_mac_randomization"
+            android:title="@string/wifi_enhanced_mac_randomization"
+            android:summary="@string/wifi_enhanced_mac_randomization_summary" />
+
         <SwitchPreference
             android:key="mobile_data_always_on"
             android:title="@string/mobile_data_always_on"
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 66b93e17b46..5bea006bffa 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -463,6 +463,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
         controllers.add(new WifiDisplayCertificationPreferenceController(context));
         controllers.add(new WifiVerboseLoggingPreferenceController(context));
         controllers.add(new WifiScanThrottlingPreferenceController(context));
+        controllers.add(new WifiEnhancedMacRandomizationPreferenceController(context));
         controllers.add(new MobileDataAlwaysOnPreferenceController(context));
         controllers.add(new TetheringHardwareAccelPreferenceController(context));
         controllers.add(new BluetoothDeviceNoNamePreferenceController(context));
diff --git a/src/com/android/settings/development/WifiEnhancedMacRandomizationPreferenceController.java b/src/com/android/settings/development/WifiEnhancedMacRandomizationPreferenceController.java
new file mode 100644
index 00000000000..af44f5b2020
--- /dev/null
+++ b/src/com/android/settings/development/WifiEnhancedMacRandomizationPreferenceController.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2020 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.development;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+/**
+ * Developer option controller for enhanced MAC randomization.
+ */
+public class WifiEnhancedMacRandomizationPreferenceController
+        extends DeveloperOptionsPreferenceController
+        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+    private static final String WIFI_ENHANCED_MAC_RANDOMIZATION_KEY =
+            "wifi_enhanced_mac_randomization";
+    private static final String ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG =
+            "enhanced_mac_randomization_force_enabled";
+
+    public WifiEnhancedMacRandomizationPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return WIFI_ENHANCED_MAC_RANDOMIZATION_KEY;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        int isEnabledInt = ((Boolean) newValue) ? 1 : 0;
+        Settings.Global.putInt(mContext.getContentResolver(),
+                ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, isEnabledInt);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        boolean enabled = false;
+        if (Settings.Global.getInt(mContext.getContentResolver(),
+                ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, 0) == 1) {
+            enabled = true;
+        }
+        ((SwitchPreference) mPreference).setChecked(enabled);
+    }
+
+    @Override
+    protected void onDeveloperOptionsSwitchDisabled() {
+        super.onDeveloperOptionsSwitchDisabled();
+        Settings.Global.putInt(mContext.getContentResolver(),
+                ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, 0);
+        ((SwitchPreference) mPreference).setChecked(false);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/WifiEnhancedMacRandomizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiEnhancedMacRandomizationPreferenceControllerTest.java
new file mode 100644
index 00000000000..4a45ce70387
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/WifiEnhancedMacRandomizationPreferenceControllerTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2020 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.development;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class WifiEnhancedMacRandomizationPreferenceControllerTest {
+    private static final String ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG =
+            "enhanced_mac_randomization_force_enabled";
+    @Mock
+    private SwitchPreference mPreference;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    private Context mContext;
+    private WifiEnhancedMacRandomizationPreferenceController mController;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new WifiEnhancedMacRandomizationPreferenceController(mContext);
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+                .thenReturn(mPreference);
+        mController.displayPreference(mPreferenceScreen);
+    }
+
+    @Test
+    public void onPreferenceChanged_enabled_shouldTurnOnEnhancedRandomization() {
+        mController.onPreferenceChange(mPreference, true /* new value */);
+
+        int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, -1);
+        assertThat(mode).isEqualTo(1);
+    }
+
+    @Test
+    public void onPreferenceChanged_disabled_shouldTurnOffEnhancedRandomization() {
+        mController.onPreferenceChange(mPreference, false /* new value */);
+
+        int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, -1);
+        assertThat(mode).isEqualTo(0);
+    }
+
+    @Test
+    public void updateState_preferenceShouldBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, 1);
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void updateState_preferenceShouldNotBeChecked() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, 0);
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void onDeveloperOptionsDisabled_shouldDisablePreference() {
+        mController.onDeveloperOptionsSwitchDisabled();
+
+        int mode = Settings.Global.getInt(mContext.getContentResolver(),
+                ENHANCED_MAC_RANDOMIZATION_FEATURE_FLAG, -1);
+
+        assertThat(mode).isEqualTo(0);
+        assertThat(mPreference.isChecked()).isFalse();
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+}