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

Change-Id: I69b7a4462e6c7fb6d6062da206cd856f48fe6fa8