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