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: I4be84a481c89a90a8a48574e0082c1d7ddb2e19c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>