Merge "Fix flaky NsdManagerTest" am: e2a1dc74f4

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

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