Merge "Modify NsdServiceTest to conform to its new mechanism" am: c9a2bdf2b9

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719018

Change-Id: I7f81b5f807114c223f53fe8417d904c4dbe5cb39