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