Merge "[automerger skipped] Merge "Add carrier config to show wifi calling...

Merge "[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" into rvc-d1-dev-plus-aosp am: 050a1516 -s ours
am skip reason: Change-Id Ib83bc042f6d95535a09769e5cdea648cc1d501a4 with SHA-1 7feb6321 is in history

Change-Id: I5063fa7371ccdee61d6ab3163819971baaa1642a