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

Change-Id: I0f100815595cf2601492f5e92b7a5deac1d24be2