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

Change-Id: Iaf6ff65ffd53c69bace644c651199ff610dd872e