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

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

Change-Id: I8f2004b084389fcea6e54d99ffa40c8bf4ee5c54