Merge "bpf: merge block.c into netd.c" into main am: 51452289e8 am: 87f6705b90

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

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