Merge "Add carrier config to show wifi calling icon in status bar" am: d5579959e4

Change-Id: I593a40536a0f0cb290f197e1dbcadbc7ffde6b8b