Merge "Remove dead code in BpfNetMaps." am: e06458378d am: 8f35671e7e

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

Change-Id: I79f0349840021b075ebf5bd6c6575bd36b260a96