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

Change-Id: Ic6bbfb254c280a8caea436b8f2eb15a865ca6bb7