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

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

Change-Id: I1f8fcdd77aec3b29dbae558f6c90de6136f5dd53