Merge "Add unit test for BpfInterfaceMapUpdate" am: d512ec646c am: 6c6cf9fecb

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

Change-Id: I14c18a5f64e62579587d6083e4a1e7c52140a2f3