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

Change-Id: I9a1b5169c76f952887ab9835281482788a12cc47