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

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

Change-Id: I147b422a90ac665ca1d8d2f6ded9ea83b9ab769c