Merge "packages/modules/Wifi: remove deprecated Mockito usages" into main