Merge "NsdManager: unit test coverage for servive registration" am: b0e408450c
am: bc57faa1ac

Change-Id: I55a7a1a33cfd30a5c8d5ede67f6a1c602a840e6a