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

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

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