Bug 1064463 - Do not set caller id explicitly when users preference is not available
Merge pull request #24417 from crh0716/1064463

Bug 1064463 - Do not set caller id explicitly when users preference is not available r=alive