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

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

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