Merge "Remove migrated config_carrier_wfc_ims_available"
am: 5d71e2d671

Change-Id: Iaf50b529303f8449b776c33942175953ff0fc6e1