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

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

Change-Id: Ica148a7ad37ce7b4bed9f53e499ff1c9c6c82f9e