Merge "Remove migrated config_carrier_wfc_ims_available" am: 5d71e2d671 am: 86cdc8f330
am: d6efda6957

Change-Id: Ic582e40064cfd28e3eaf036af4b34b016cee07ec