Merge "Merge "Fix problems of SIM lock screen of eSIM" into oc-mr1-dev am: e8d01e269b" into oc-mr1-dev-plus-aosp
am: 0f69a41103

Change-Id: Ic2ed814a6d39435b4d430d2f9f9122d7ed0253aa