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

Change-Id: I3c30ca6606fef3f9055f774196b38f81dded4bfc