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