diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 08a09e1..be747ef 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -38,6 +38,7 @@
     ":display_flags_lib{.generated_srcjars}",
     ":android.multiuser.flags-aconfig-java{.generated_srcjars}",
     ":android.app.flags-aconfig-java{.generated_srcjars}",
+    ":android.credentials.flags-aconfig-java{.generated_srcjars}",
 ]
 
 filegroup {
@@ -355,3 +356,16 @@
     aconfig_declarations: "android.hardware.radio.flags-aconfig",
     defaults: ["framework-minus-apex-aconfig-java-defaults"],
 }
+
+// Credential Manager
+aconfig_declarations {
+    name: "android.credentials.flags-aconfig",
+    package: "android.credentials.flags",
+    srcs: ["core/java/android/credentials/flags.aconfig"],
+}
+
+java_aconfig_library {
+    name: "android.credentials.flags-aconfig-java",
+    aconfig_declarations: "android.credentials.flags-aconfig",
+    defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}
diff --git a/core/java/android/credentials/flags.aconfig b/core/java/android/credentials/flags.aconfig
new file mode 100644
index 0000000..0d0305b
--- /dev/null
+++ b/core/java/android/credentials/flags.aconfig
@@ -0,0 +1,8 @@
+package: "android.credentials.flags"
+
+flag {
+    namespace: "credential_manager"
+    name: "settings_activity_enabled"
+    description: "Enable the Credential Manager Settings Activity APIs"
+    bug: "300014059"
+}
\ No newline at end of file