Merge "DO NOT MERGE Fix voicemail SIM card name unknown after unlock PIN." into nyc-mr1-dev
am: c6bcda2e1c

* commit 'c6bcda2e1c56d22d9e89fe72043ee9ce590e9f49':
  DO NOT MERGE Fix voicemail SIM card name unknown after unlock PIN.

Change-Id: I55b33a42d8f1e194dc7f847a6ae6895d20a08cd1