diff --git a/integration_tests/androidx_test/src/main/AndroidManifest-NoTestPackageActivities.xml b/integration_tests/androidx_test/src/main/AndroidManifest-NoTestPackageActivities.xml
new file mode 100644
index 00000000000..30c87ddbfaf
--- /dev/null
+++ b/integration_tests/androidx_test/src/main/AndroidManifest-NoTestPackageActivities.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Manifest for ATSL integration tests
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.robolectric.integration.axt">
+    <uses-sdk android:targetSdkVersion="28"/>
+
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+
+    <application>
+        <activity android:name="org.robolectric.integrationtests.axt.EspressoActivity"
+                  android:label="Activity Label"
+                  android:exported="true" />
+        <activity android:name="org.robolectric.integrationtests.axt.ActivityWithPlatformMenu"
+            android:exported="true">
+        </activity>
+        <activity android:name="org.robolectric.integrationtests.axt.ActivityWithAppCompatMenu"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat" />
+        <activity android:name="org.robolectric.integrationtests.axt.AppCompatActivityWithToolbarMenu"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.NoActionBar" />
+        <activity android:name="org.robolectric.integrationtests.axt.ActivityWithSwitchCompat"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat" />
+        <activity android:name="org.robolectric.integrationtests.axt.StubBrowserActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/integration_tests/androidx_test/src/test/AndroidManifest-NoTestPackageActivities.xml b/integration_tests/androidx_test/src/test/AndroidManifest-NoTestPackageActivities.xml
new file mode 100644
index 00000000000..c4f5e2b53a1
--- /dev/null
+++ b/integration_tests/androidx_test/src/test/AndroidManifest-NoTestPackageActivities.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.robolectric.integrationtests.axt">
+
+  <uses-sdk
+      android:minSdkVersion="14"
+      android:targetSdkVersion="27"/>
+
+  <application>
+    <activity android:name=".EspressoActivity" android:exported="true"/>
+  </application>
+
+  <instrumentation
+      android:name="androidx.test.runner.AndroidJUnitRunner"
+      android:targetPackage="org.robolectric.integration.axt"/>
+
+</manifest>
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowServiceManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowServiceManager.java
index 256df8bed3a..bed1c9e3c8c 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowServiceManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowServiceManager.java
@@ -55,6 +55,7 @@
 import android.net.INetworkScoreService;
 import android.net.ITetheringConnector;
 import android.net.nsd.INsdManager;
+import android.net.vcn.IVcnManagementService;
 import android.net.wifi.IWifiManager;
 import android.net.wifi.aware.IWifiAwareManager;
 import android.net.wifi.p2p.IWifiP2pManager;
@@ -192,6 +193,7 @@ public class ShadowServiceManager {
       addBinderService(Context.SPEECH_RECOGNITION_SERVICE, IRecognitionServiceManager.class);
       addBinderService(Context.LEGACY_PERMISSION_SERVICE, ILegacyPermissionManager.class);
       addBinderService(Context.UWB_SERVICE, IUwbAdapter.class);
+      addBinderService(Context.VCN_MANAGEMENT_SERVICE, IVcnManagementService.class);
     }
   }