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

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

Change-Id: I94fe6e1bc6d150786eaf8ae0de7c89a9c9684191