[automerger skipped] Merge "Revert "Disable NsdManager tests that need a new prebuilt"" into tm-dev am: 6d43bead70 -s ours

am skip reason: Merged-In I44dda14cae265e600010c6f8efe1471ac481c6ea with SHA-1 af662270a5 is already in history. Merged-In was found from reverted change.

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

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

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