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

Change-Id: I8011d7cbfedf6e3799d264ce0817e1261ed4d2a8