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

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

Change-Id: I095832611b0b17c0f6158f2d5ea6e84f21cc9731