Merge "Revert "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT""
am: b0896e61f8

Change-Id: I356bd75a0d1b0a0334cde5703a9ce7a24874bed4