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

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

Change-Id: I6cdca2a00127c8354a360adac7c1e63e5630b975