Merge "Modify NsdServiceTest to conform to its new mechanism" into sc-dev am: fcc69726ed

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

Change-Id: I93de1a01024f6bddcb8575c1b9038d901acfe3c7