Merge "Clean up BpfNetMaps" am: d36de12652

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

Change-Id: I3351f56844a9b48ff4f77d2e7cc723102e255745