Merge "IMS Conference fixes related to RemoteConnectionServices."
am: 91b31579bd

Change-Id: Ie9e6ec1162aa34f8a4d11324a5f58186b57ef0cf