Merge "DO NOT MERGE Revert "Adds SIM PUK locked conditions to e911 calling"" am: 96cd9933de  -s ours
am: 6c41fa24f7  -s ours

Change-Id: I283dc2236f0b9928bfac744d41d4102c3c068a13