Merge "Ignore testFactoryReset in instant app mode" am: f3283e6b93 am: c60aab0243

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1735673

Change-Id: Ibf0f8cf56360ffaa9c94f089018bbfe885373706

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

@@ -2056,6 +2056,7 @@ public class ConnectivityManagerTest {
         assertThrows(SecurityException.class, () -> mCm.factoryReset());
     }
 
+    @AppModeFull(reason = "Cannot get WifiManager in instant app mode")
     @Test
     public void testFactoryReset() throws Exception {
         assumeTrue(TestUtils.shouldTestSApis());