Merge "NsdManager: add unit tests"
am: dc54ad7fc3

Change-Id: I928f19e359b7423d43d792c413de4195a64141a7