Merge "Fix flaky NsdManagerTest" am: e2a1dc74f4

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

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