Merge "Add carrier config variable to hide manage IMS conference call button" am: dc98d6e44b am: 7a42c3614e
am: 9a1be6187f  -s ours

Change-Id: Iaa42715945ecdf29efd6acc733755979ecde152e