Merge "Fix issue that the wifi calling text cannot be customized based on sim"
am: 5b3ee7afaa

Change-Id: Iffac84438bf43372a1ddeb4df1ef9d85c9af2a2d