Merge pull request #20792 from crh0716/1022710

Bug 1022710 - Do not update the visibility of the items when the voice type is null r=eragon
Merge pull request #20784 from crh0716/1023044

Bug 1023044 - Show the signal bar for a locked sim only when making emergency calls using the sim. r=alive