Merge "Clean up BpfNetMaps" am: d36de12652 am: 33a41b8d64

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

Change-Id: Ia40abc2b52018adcfadbb3976b1ffd7058845691