Merge "Fix flaky NsdManagerTest" am: e2a1dc74f4 am: 0008fa1a04

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

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