Merge "Replace checkNetworkStackPermission in TestNetworkService"