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

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

Change-Id: I89fff067ab910fa1ab61d73a6ec9a4788d62b153