Merge "Add unit test for BpfInterfaceMapUpdate" am: d512ec646c am: a2d92ecd83

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

Change-Id: I99e314ecffd8d14ee43d22595b6511317abe295e