Merge "NsdServiceInfo: move test to tests/net"