simplify bpf tests and check type correctness am: 787de0100e am: ebb8a35ad7

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

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