Merge "ConnectivityMetricsEvent: add ifname, netid, transports"