Merge "Ensure IMS conference participants have number presentation set." into oc-dr1-dev am: a3198af063
am: f9048005e4

Change-Id: Ie8ed5a86d2befce2c58d9a5d16101df01f6e9a74