Merge "bpf network stats - remove dead code" am: 93979804b7 am: 0d4e1c6574

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

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