Merge "Clean up BpfNetMaps" am: d36de12652 am: 3df1c2082a

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

Change-Id: Id258375a15fe2a43192185796d0ebe3edae520e8