[automerger skipped] Merge "Resist SIM logical channel leaking when clients...

[automerger skipped] Merge "Resist SIM logical channel leaking when clients crash" am: ce16332d am: 27176158 am: 5a282212 -s ours am: ca4ee7e9 -s ours

am skip reason: Merged-In I37ecc55a7b886d10b84a75054c237bbc05f925c4 with SHA-1 3dc7d108 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2039447

Change-Id: I19f40403a84e3c9c6c17deead1cbc8e2c6c4061f