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

Change-Id: I0b47ad5a1ccee4a2efb169d717b512a46ad4ecc2