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

Change-Id: I30d43bbdd9aa49823965594066a2486f8e8c1d41