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

Change-Id: I75b8ccda5345f924c5a633c9e06f85d495118fe8