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

Change-Id: I24f9b9c6baf3b28c32ffaee9bbaad0bd592e4f66