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

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

Change-Id: I2e00ca1138bc428ee71cfaef7ba0590bad815894