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

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

Change-Id: Ic65ec9a1f02977bf2bf7f797543a52038a4d6d04