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

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

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