Merge "Use MdnsUtils helper methods to construct query packets" into main