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

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

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