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

Change-Id: Id8ca403a839cff994970c370973a91e8e5688722