Merge "bpf_headers: add DEFINE_BPF_RINGBUF macro" into main am: 0f8d12ee74 am: f0b2542168

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

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