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

Change-Id: Ie44c2cca8d579a44359c9fea6eb8c72338d82d3e