diff --git a/api/Android.bp b/api/Android.bp
index 5714014297e32..07fd8503d9a15 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -95,6 +95,7 @@ combined_apis {
         "framework-adservices",
         "framework-appsearch",
         "framework-bluetooth",
+        "framework-configinfrastructure",
         "framework-connectivity",
         "framework-connectivity-t",
         "framework-federatedcompute",
diff --git a/boot/Android.bp b/boot/Android.bp
index 7e55b3bfed6a8..9fdb9bc6506a1 100644
--- a/boot/Android.bp
+++ b/boot/Android.bp
@@ -63,6 +63,10 @@ platform_bootclasspath {
             apex: "com.android.btservices",
             module: "com.android.btservices-bootclasspath-fragment",
         },
+        {
+            apex: "com.android.configinfrastructure",
+            module: "com.android.configinfrastructure-bootclasspath-fragment",
+        },
         {
             apex: "com.android.conscrypt",
             module: "com.android.conscrypt-bootclasspath-fragment",