Merge "Stop using Mockito static mocking in BpfDumpTest" into main am: 1d1cc3a36d

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

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