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

Change-Id: Id87f4ba6162cc1e0a60d13004e3adf586c8f5819