Merge "NetBpfLoad: chose bpfloader version at runtime based on Android OS" into main am: c2d425aab0 am: f2fd53e38f

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

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