Merge "Finish moving NetworkStats tests to tests/net"