Merge "Add carrier config to hide merge button for IMS conference"
am: b0bd3b756b

Change-Id: I2277e2a33b9e3986fac884cdc3c90b59ac4a30cf