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

Change-Id: Ie7830657ccfa9b1493bf2a4489004cbd96bca408