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

Change-Id: I7a0be565cebff2f87b136a6c29484ee43ca116ab