Merge "Resist SIM logical channel leaking when clients crash" am: d66bcb58b6 am: 626d0ddc31

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

Change-Id: I08f9845b742e21b92faf69bd12a679ad10f699ed