Merge "Changed the three carrier config items for consistency KEY_SATELLITE_ROAMING_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT KEY_SATELLITE_ROAMING_P2P_SMS_INACTIVITY_TIMEOUT_SEC_INT KEY_SATELLITE_ROAMING_ESOS_INACTIVITY_TIMEOUT_SEC_INT" into main