Merge "NsdManager: unit test coverage for servive registration" am: b0e408450c am: bc57faa1ac am: 9a3e69d9b6
am: 783019d2ff

Change-Id: I88461d537e43fb086366dcc681b5ef2c2bdcdc2f