NetBpfLoad: gently enable mainline am: 231598bc92 am: aa022f8758

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

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