Merge pull request #9289 from ronald-cron-arm/adapt-components-with-psa-crypto-config-enabled-3.6

[Backport 3.6] Partial backport of PR 9185