Merge "Fix NPE when removing PIN locked SIM during E911 call" into oc-mr1-dev