Merge "Fix the wifi calling prompt display when wfc configured disabled" am: c5bb833713
am: a0504b663c

Change-Id: I71ac53ddfc74f97a91ccc167059da0f710449231