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

Change-Id: I632729057e5b183793ff39fcdbcc947e9ba6ef3b