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

Change-Id: I0bb715785a7ea0286936b1213c5057497b8856de