Merge "Stop using Mockito static mocking in BpfDumpTest" into main