[automerger skipped] Merge "Add carrier config to show wifi calling icon in...
[automerger skipped] Merge "Add carrier config to show wifi calling icon in status bar" into rvc-dev am: 4a758b47 am: f05bf2aa -s ours
am skip reason: Change-Id Ib83bc042f6d95535a09769e5cdea648cc1d501a4 with SHA-1 4583ccb9 is in history
Change-Id: I0d7eda5eeb9802466a6a9682b5663eb797edae76