Merge "Fix testTetherClatBpfOffloadUdp test failure" into main