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

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

Change-Id: I56a8be30a563577977d389bef8c2d805d17fa9a2