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

Change-Id: I559e5cfcc1c46e8c2faa3348d75e065ad3641ea4