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

Change-Id: I44cae417fcddad72c13938b6fb751de6ed784046
tree: 480a466a30098c7dc194c4ec2aa25dfdc476534f
  1. core/
  2. services/
  3. tests/