Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" am: ddf3660af8 am: f786aa57e9

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

Change-Id: I983838a0e9a0b32d0ab66bbdcfdb117c9652cf55

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

@@ -501,6 +501,7 @@ public class ConnectivityManagerTest {
     @Test
     public void testGetAllNetworkStateSnapshots()
             throws InterruptedException {
+        assumeTrue(mPackageManager.hasSystemFeature(FEATURE_TELEPHONY));
         // Make sure cell is active to retrieve IMSI for verification in later step.
         final Network cellNetwork = mCtsNetUtils.connectToCell();
         final String subscriberId = getSubscriberIdForCellNetwork(cellNetwork);