Merge "Revert "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT""