Merge "Fix issue that the carrier configs are not updated after SIM unlocked" am: 37bd9aabfa am: 23110f2642
am: 9a10ed4606

Change-Id: I75d7b949a289a8bb2dc8e9c70c705bfd4673ff33