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

Change-Id: Ifdbc53e8a7568a7d71fd7bc4561f7ed59215361d