Merge "NsdServiceInfo: move test to tests/net" am: 48859e01d5
am: 1b0f4bf606

Change-Id: I2c27790f23d1ecc7b42dbbe28313f0533a1bab53