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

Change-Id: I5c936e60a5f7abb7dcdbe2c6460c817fce7a95b5