Fix incorrect conferenceableCalls update am: 85ada827d3 am: bc59ec9d40
am: 1531bb8f1a

Change-Id: Ida8c5ded40ab449db167b2b018fde6edc9e86d47