Merge "Modify Nsd{Service,Manager}Test to conform to its change" into sc-dev am: 3c20df39d0

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

Change-Id: Ifd8002745d97881414c29faa05820328e4833ae6