Merge changes from topic "bpf_slash_progs" into main am: 6c2a00f049 am: 10fda93935

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

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