Merge "Avoid updating carrier config if sim is still loading when unlock." into oc-dr1-dev