Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone"