Merge "Fix issue that the carrier configs are not updated after SIM unlocked"