Merge "packages/apps/Contacts: remove deprecated Mockito usages" into main