Merge changes from topic "netbpfload" into main am: 9c01dd494d

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

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