Merge "Address nit from aosp/1301317" am: 14a5bf9510 am: 7b20fde8c9 am: b0af0ee400 am: 7af6037609 am: 02e86a3687

Change-Id: Id24f6eadf126616a8585ce56aef0de7f1c68c44b

tests/net/java/com/android/server/ConnectivityServiceTest.java

@@ -5494,6 +5494,8 @@ public class ConnectivityServiceTest {
         assertFalse(nc.hasTransport(TRANSPORT_WIFI));
         // For safety reasons a VPN without underlying networks is considered metered.
         assertFalse(nc.hasCapability(NET_CAPABILITY_NOT_METERED));
+        // A VPN without underlying networks is not suspended.
+        assertTrue(nc.hasCapability(NET_CAPABILITY_NOT_SUSPENDED));
 
         // Connect cell and use it as an underlying network.
         mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR);