Merge "Eliminate spurious COMPILE_FOR_BPFLOADER_VERSION macro" into main am: d0901e4caa

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

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