Merge "fix BpfMapTest" into tm-dev am: 12f84d0c4e

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

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