simplify bpf tests and check type correctness am: 787de0100e

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

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