Merge "Add config_carrier_wfc_ims_available to config.xml" am: d1d682e446
am: 4fe680f920

Change-Id: I180db3ee55eb43d66e3eef89b3e6c1c57fc25cf2