Merge "BpfMap.java - remove spurious import" into main am: d769babaab am: 5f55d55d1f

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

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