Merge "NetBpfLoad - change BPFLOADER_VERSION macro into an argument" into main am: d3812614d8

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

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