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

Change-Id: Ib3a4b1bf5eb649a67885c035e1222560b67926c7