Merge "netbpfload: prep work to support <U" into main am: 906cac004f

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

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