Merge "Ignore testRestrictedNetworkPermission on Q"