Merge "Fix testTetherClatBpfOffloadUdp test failure" into main am: cca6589298 am: d59cc4f79d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3256557

Change-Id: Ib02fa16433b1194a4063fdca16c730c619932c53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>