Merge "Remove unused BpfNetMap jni function" am: c8f38c77a9 am: 9fd8650d94

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

Change-Id: I4df28ad91387a8ccaf9b5694ef97e23e9592dfb3