Merge "Address nit from aosp/1301317" am: f0edf03f am: b1f5f8d5

        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);