Snap for 6582636 from 70ba9ad724dad32a5ce5aa991e5e147f14206c43 to rvc-release

Change-Id: Ie428c18695969f7c852d2f050d05282dcd390d3f

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

@@ -68,7 +68,6 @@ public class MultinetworkApiTest extends AndroidTestCase {
         mCM = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
         mCR = getContext().getContentResolver();
         mCtsNetUtils = new CtsNetUtils(getContext());
-        mCtsNetUtils.storePrivateDnsSetting();
     }
 
     @Override
@@ -223,6 +222,7 @@ public class MultinetworkApiTest extends AndroidTestCase {
 
     @AppModeFull(reason = "WRITE_SECURE_SETTINGS permission can't be granted to instant apps")
     public void testResNApiNXDomainPrivateDns() throws InterruptedException {
+        mCtsNetUtils.storePrivateDnsSetting();
         // Enable private DNS strict mode and set server to dns.google before doing NxDomain test.
         // b/144521720
         try {