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

Change-Id: I4f8232db1b11be07363cda7ddf954dd4a51e0629