diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 14055ac19e5be..98052d60f78ba 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -10280,6 +10280,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 0edc0d6b9ed60..896354c7fa81d 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -4974,6 +4974,10 @@
+
+
+
false
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 602d5f9c691e3..bb0500d1d9b6f 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -4099,6 +4099,7 @@
+