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

* commit '1b4130e2fe004f3bf3e3f457d8bea400b34a8295':
  Fix voicemail SIM card name unknown after unlock PIN.

Change-Id: I606d1975e65f443b4f50ad85df389600b7b2e9e3