Merge "Add carrier config to show wifi calling icon in status bar" into rvc-dev am: 4a758b479b

Change-Id: I44a81cc4cf46aca238d897addbe771d4cb3ac2c8