Merge "Remove migrated config_carrier_wfc_ims_available" am: 5d71e2d671 am: 86cdc8f330 am: d6efda6957
am: f93beccd12  -s ours

Change-Id: I4a9169ac552a62191fe9142dd3e73f1996bdd1b4