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

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

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