Merge "Add bpf forwording packet count test" am: faaaffc8a0 am: 939068fd80 am: 7697786713

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

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