Merge "Send proper call state in CLCC in an IMS conference"
am: fca12b76bf

Change-Id: I14fb5aa1949ea4d76ddaf69292de996966fd0991