Merge "Fix testIkeOverUdpEncapSocket flakiness caused by cached ifaceStats" into main