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

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

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