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

Change-Id: I9f3e64af21c460370b097f3d76d1c37650b6e8b5