Merge "[Feature sync] Fix flaky test in MdnsSocketClientTests" am: 9a726855f2

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

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