diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e14cba7f903..2fe830372e2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4589,6 +4589,11 @@
             android:exported="false">
         </activity>
 
+        <activity
+            android:name="com.android.settings.spa.SpaDebugActivity"
+            android:exported="false">
+        </activity>
+
         <!-- This is the longest AndroidManifest.xml ever. -->
     </application>
 </manifest>
diff --git a/src/com/android/settings/spa/SpaDebugActivity.kt b/src/com/android/settings/spa/SpaDebugActivity.kt
new file mode 100644
index 00000000000..40fe1d5822b
--- /dev/null
+++ b/src/com/android/settings/spa/SpaDebugActivity.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.spa
+
+import com.android.settingslib.spa.framework.DebugActivity
+
+class SpaDebugActivity :
+    DebugActivity(SpaEnvironment.settingsEntryRepository, SpaActivity::class.java)