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

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

Change-Id: I1453035720d4a2acc01afe03f46d1cbb2b3b2de8