Merge "Use NsdServiceInfo ifIndex in MdnsDiscoveryManager" into main