Merge "Fix test flake in MdnsDiscoveryManagerTests" into main