Merge "Remove unused BpfNetMap jni function" am: c8f38c77a9 am: e5f72a37ac am: 8232c5cc74

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

Change-Id: I73488eaceb49e8e625f2731ace731417f7783397