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

Change-Id: I82cc24ae9885cec3f2fcb8fe7878dc4be6924291