Merge "Revert "Temporarily disable NsdService unit tests"" into tm-dev am: 705d85bf3f

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

Change-Id: I8bb115095a268751ca9ea80e38c92fbfb542ab08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>