Merge "Expose KEY_CARRIER_DEFAULT_WFC_IMS_{ROAMING_,}MODE_INT"
am: d8523f3c01

Change-Id: I74bbd4bf00140e06a3a20d9f41f7078d8ac6ba50