Merge "Fix voicemail SIM card name unknown after unlock PIN." am: aa50786189
am: 2ac03a08db

* commit '2ac03a08dbfe8965e7574b74fc90769f638d0c22':
  Fix voicemail SIM card name unknown after unlock PIN.

Change-Id: Iaeea3621323b067b71adbcf31827e3a218c3c23f