Merge "Cleanup the SipDelegates associated with an app if it dies" am: 95e5e3b3a9 am: 549b8da748

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

Change-Id: I31e16a1b6e89baf513b7399e733f69b9a443d217