Merge "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT"
am: 3d48b0e1cd

Change-Id: I2f9f58ada65300be311cbca4ae338c847f4ff6f3