Merge "Avoid updating carrier config if sim is still loading when unlock." into oc-dr1-dev am: f7541d6dab
am: 818a5571da

Change-Id: I42d5553db8ff287f4c5720d9b74910705d1265d1