Merge "Do not send update to carrier config if SIM card is still locked" into sc-dev