Merge "Clean up BpfNetMaps" am: d36de12652

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

Change-Id: Id1dec2119e9c3c4cf4cd4ed88009244ee3a0ba32