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

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

Change-Id: Ide5c79b763ca22ce12760450deae9e5ae9d7d759