Merge "Fix NPE when removing PIN locked SIM during E911 call" am: b7dc3a3b am: 49107392 am: 5b2afc8d am: 6a834447 Change-Id: I0c54947c73d99fbbaa976273f17746cc009b4e24