Merge "bpf: switch to mainline netbpfload on Android S/SV2" into main am: 7b7ab02f25

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

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