[automerger skipped] Merge "Move ConferenceParticipant from telecom namespace...
[automerger skipped] Merge "Move ConferenceParticipant from telecom namespace to IMS." am: 4d89fb53 am: 7bcf28b2
am: 431f3ff3 -s ours
am skip reason: change_id Id4428c327a48e8b7d512fe395bf30a202e47bc8f with SHA1 38df4a92 is in history
Change-Id: I8585d2237366d9eb8901d5973a4c5827973384b6