Merge "Fix NPE when removing PIN locked SIM during E911 call" into oc-mr1-dev
am: ad545464c2  -s ours

Change-Id: I9285e05fb9278057240769648c3fa23c2b271ced