Merge "Ignore BPF tethering offload test if tether config is disabled" am: dd9a89c2f2 am: 33936d9b2f

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

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