Merge pull request #9235 from gilles-peskine-arm/psa_generate_key_custom-3.6

Backport 3.6: psa_generate_key_custom