[automerger skipped] Merge "Fix issue that the wifi calling text cannot be customized based on sim" am: 5b3ee7afaa am: e3844769e6
am:ecd1998ea0-s ours am skip reason: change_id I6b3f6b06c9cc984ee6a68a19ae317b5d1d4e48e2 with SHA1af5c05392bis in history Change-Id: I166d407d0d26e4bb3b270308986076a9ab5fecc3
This commit is contained in: