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

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

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