Fix incorrect conferenceableCalls update am: 85ada827d3
am: bc59ec9d40

Change-Id: I46c6824ffa859e99ce8f1cbe0cc6540616fd6dfb