Merge "Improvements to the stability of SipDelegateManager based on CTS Testing" am: c320c9c61e am: 765fd24c86

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

Change-Id: Iaac881b0cbcacd845f89772a47e9fc8ce6246863