Merge "Revert "Disable NsdManager tests that need a new prebuilt"" into tm-dev am: 6d43bead70

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

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