[automerger skipped] Merge "Fix issue that the wifi calling text cannot be customized based on sim" am: 9c61995e2c am: 59bbfdb211
am: 60b8acbc43 -s ours
am skip reason: change_id Ifb6025cb7c95bfb43c1d0f2d07d4246be77b3039 with SHA1 6fec455d44 is in history

Change-Id: I9645906455cf60099d195f64a41f44449ffc3e78