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

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

Change-Id: Ie485f459e8cb773368ae055992af19c8033b6c24