Merge "Remove dead code in BpfNetMaps." am: e06458378d am: 1e048b4432 am: 923ba912a5

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

Change-Id: Ie05a0338563aed6146ee8559b8a031c874dfab7b