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

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

Change-Id: If80d16ea7c6f49e482eb3488329878b231d248e5