Code Moderator resolve the conflict issue

Merge branch 'Integration_Rel20_SA5_166_YAML' into 'Rel20_CRXXX_TS-28.312_Enhancement_on_the_interactions_between_intent_handling_function_and_NDTFunction'

# Conflicts:
#   OpenAPI/TS28312_IntentNrm.yaml