Merge "offload/test bpf: support InProcessTethering" am: 2b21c2510b am: a3c9404bab

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

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