Merge pull request #17388 from lissyx/bug985117

Bug 985117 - Use the correct SIM number to query voicemail number r=alive
Merge pull request #17373 from crh0716/985090

Bug 985090 - Fix voicemail number migration issue and refactor r=jaoo