Merge branch 'master' into enh/text-processing-provider-with-id

diff --cc apps/settings/lib/Settings/Admin/ArtificialIntelligence.php
index 25c815cb14059fe142857b248ce76562149df650,8a283ba1e706123be81ced6ce15375a18c7e92f8..e2862139e494bed03c82556d22c977205c495736
--- 1/apps/settings/lib/Settings/Admin/ArtificialIntelligence.php
--- 2/apps/settings/lib/Settings/Admin/ArtificialIntelligence.php
+++ b/apps/settings/lib/Settings/Admin/ArtificialIntelligence.php
@@@ -31,9 -31,9 +31,10 @@@ use OCP\IConfig
  use OCP\IL10N;
  use OCP\Settings\IDelegatedSettings;
  use OCP\SpeechToText\ISpeechToTextManager;
+ use OCP\SpeechToText\ISpeechToTextProviderWithId;
  use OCP\TextProcessing\IManager;
  use OCP\TextProcessing\IProvider;
 +use OCP\TextProcessing\IProviderWithId;
  use OCP\TextProcessing\ITaskType;
  use OCP\Translation\ITranslationManager;
  use Psr\Container\ContainerExceptionInterface;

diff --cc lib/composer/composer/autoload_classmap.php
Simple merge

diff --cc lib/composer/composer/autoload_static.php
Simple merge