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

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

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