In some way, mocking the OAuth2AuthorizedClientRepository and publishing it as a bean causes Spring MVC's RequestMappingHandlerAdapter bean to be constructed before the OAuth2AuthorizedClientArgumentResolver can be registered.
Changing the corresponding tests to use HttpSessionOAuth2AuthorizedClientRepository addressed the issue so that the upgrade could happen, though this should still be investigated to find the root cause.