Merge "Telecomm: remove usages of deprecated Mockito matchers" into main