Merge "Fix issue that "Wi-Fi call" disappears when Wi-Fi call is on hold" am: 0e51ec107b
am: 91ab769c11

Change-Id: I3c2dc92d55539ca1369d6a27bb9ca16e572a2905