[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 -s ours am: 57bf7670 -s ours am: 6ec52ca0 -s ours am: 6320b7f9 -s ours
am skip reason: Change-Id Ib83bc042f6d95535a09769e5cdea648cc1d501a4 with SHA-1 7feb6321 is in history

Change-Id: Ic878efcfe75235383420604c38271244e0437142