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

Change-Id: I11af75ab8ebc4081cc90d29b83d8a1742f00a3ab