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

Change-Id: I6ef0cb89103dd26a9ffde61a022c753ea9aa97e8