Merge "[Feature sync] Fix flaky test in MdnsSocketClientTests"