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

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

Change-Id: I1272f5bb194ba0e782d6d62c6f0f462cba8cd998