Merge "fix BpfMapTest" am: e273ba1e21 am: defa8c5779

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

Change-Id: I52525ae5be08ffe8333efe97a85cc639fbaef4e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>