Merge branch 'cr/102232-1/127' into 'meeting/LI74'

TS 102 232-1 CR 127 - Remove deprecated encryption types from Annex G

See merge request !355