MT#64789 Content-ID value format compliance

Content-ID header value in the SIP/MIME payload is non-compliant
with specifications.
Fix removes the extra 'cid:' chars and wraps value in '<>' making it
compliant to the specifications.

Change-Id: I894789ddab1f5f95ebc1074341604ed0f3f38881
(cherry picked from commit a8b4800d89)
(cherry picked from commit 121e131a56)

scenarios/invite_emergency_pidflo/sipp_scenario_responder00_test.yml.tt2

@@ -26,7 +26,7 @@ messages:
   - 'a=ptime:50'
   - '--unique-boundary-1'
   - 'Content-Type: application/pidf\+xml'
-  - 'Content-ID: cid:\d+@invite-emergency-pidflo.scenarios.test'
+  - 'Content-ID: <\d+@invite-emergency-pidflo.scenarios.test>'
   - 'Content-Disposition: by-reference;handling=optional'
   - '<\?xml version="1.0" encoding="UTF-8"\?>'
   - '<presence'
@@ -78,7 +78,7 @@ messages:
   - '</presence>'
   - '--unique-boundary-1'
   - 'Content-Type: application/emergencyCall.ProviderInfo\+xml'
-  - 'Content-ID: cid:\d+@invite-emergency-pidflo.scenarios.test'
+  - 'Content-ID: <\d+@invite-emergency-pidflo.scenarios.test>'
   - 'Content-Disposition: by-reference;handling=optional'
   - '<\?xml version="1.0" encoding="UTF-8"\?>'
   - '<emergencyCall.ProviderInfo xmlns="urn:ietf:params:xml:ns:emergencyCall.ProviderInfo">'