Merge "Use IBpfMap type instead of BpfMap type" am: 171c817072 am: ba668afa4b

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

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