diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index daeaeed895795..e2c69f9538a77 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -10297,6 +10297,15 @@ public final class Settings {
*/
public static final String NEARBY_SHARING_SLICE_URI = "nearby_sharing_slice_uri";
+ /**
+ * Current provider of Fast Pair saved devices page.
+ * Default value in @string/config_defaultNearbyFastPairSettingsDevicesComponent.
+ * No VALIDATOR as this setting will not be backed up.
+ * @hide
+ */
+ public static final String NEARBY_FAST_PAIR_SETTINGS_DEVICES_COMPONENT =
+ "nearby_fast_pair_settings_devices_component";
+
/**
* Controls whether aware is enabled.
* @hide
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 1997e91a579e5..7e14dc9b3336b 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -4978,6 +4978,10 @@
+
+
+
false
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 1884467cdcacc..f86add6e4e3b6 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -4100,6 +4100,7 @@
+