Merge "Fix NPE when removing PIN locked SIM during E911 call"
am: b7dc3a3b21

Change-Id: I16555b53bbf9c743921cbd36578af3550705a242