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

Change-Id: I78ead9b04b8ec4c7a9fc49e449d7bfb0f3303ce1