Merge "Add carrier config variable to hide manage IMS conference call button"
am: dc98d6e44b

Change-Id: I474338d3475706f856e63fc8c558850c3afd0bb3