Merge "Correct issues with post-SRVCC conference." into sc-qpr1-dev am: 717eada8af am: 494bd63588 am: c0444d2964

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/16059212

Change-Id: I685ff0711026d1f87434ce02d92cf37bd7d27ac0