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

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

Change-Id: I1e29e07b0c0fc7734b9e3a9675735708e9424586