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

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

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