diff --git a/res/values/strings_ext.xml b/res/values/strings_ext.xml
index 15900b20198..3c6fdf5a2cb 100644
--- a/res/values/strings_ext.xml
+++ b/res/values/strings_ext.xml
@@ -27,4 +27,7 @@
     <string name="privileged_euicc_management_title">Enable privileged eSIM management</string>
     <string name="privileged_euicc_management_summary">Requires sandboxed Google Play installation</string>
 
+    <string name="clipboard_auto_clear_title">Clipboard auto clear</string>
+    <string name="clipboard_auto_clear_summary">Automatically clear the clipboard after a selected duration of time</string>
+
 </resources>
diff --git a/res/xml/privacy_dashboard_settings.xml b/res/xml/privacy_dashboard_settings.xml
index 7bd0dc1cc0e..262ca3c501a 100644
--- a/res/xml/privacy_dashboard_settings.xml
+++ b/res/xml/privacy_dashboard_settings.xml
@@ -89,6 +89,13 @@
         android:summary="@string/screenshot_timestamp_exif_summary"
         settings:boolSettingField="android.ext.settings.ExtSettings SCREENSHOT_TIMESTAMP_EXIF"/>
 
+    <!-- Clipboard auto clear -->
+    <ListPreference
+        android:key="clipboard_auto_clear_timeout"
+        android:title="@string/clipboard_auto_clear_title"
+        android:summary="@string/clipboard_auto_clear_summary"
+        settings:controller="com.android.settings.privacy.ClipboardTimeoutController"/>
+
     <!-- Show passwords -->
     <SwitchPreference
         android:key="show_password"
diff --git a/src/com/android/settings/privacy/ClipboardTimeoutController.java b/src/com/android/settings/privacy/ClipboardTimeoutController.java
new file mode 100644
index 00000000000..8207e4e23ca
--- /dev/null
+++ b/src/com/android/settings/privacy/ClipboardTimeoutController.java
@@ -0,0 +1,33 @@
+package com.android.settings.privacy;
+
+import android.content.Context;
+import android.ext.settings.ExtSettings;
+
+import com.android.settings.ext.IntSettingPrefController;
+import com.android.settings.R;
+
+import static java.util.concurrent.TimeUnit.HOURS;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+public class ClipboardTimeoutController extends IntSettingPrefController {
+
+    public ClipboardTimeoutController(Context ctx, String key) {
+        super(ctx, key, ExtSettings.CLIPBOARD_AUTO_CLEAR_TIMEOUT);
+    }
+
+    @Override
+    protected void getEntries(Entries entries) {
+        entries.add(R.string.switch_off_text, 0);
+        entries.add(10, SECONDS);
+        entries.add(30, SECONDS);
+        entries.add(1, MINUTES);
+        entries.add(5, MINUTES);
+        entries.add(10, MINUTES);
+        entries.add(30, MINUTES);
+        entries.add(1, HOURS);
+        entries.add(2, HOURS);
+        entries.add(4, HOURS);
+        entries.add(8, HOURS);
+    }
+}