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

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

Change-Id: I9cf3cc5a4cf661f9a4571934d3e26b15c7a96837