Merge "Remove unused BpfNetMap jni function" am: c8f38c77a9

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

Change-Id: I3404923a1249dabdded79bc6620e7269cd466313