[automerger skipped] Merge "Resist SIM logical channel leaking when clients crash" am: d66bcb58b6 am: 626d0ddc31 am: 2d893a1fcb -s ours am: e5feb25816 -s ours

am skip reason: Merged-In Ib511f2d05094f58661f32f652a87034df174d21d with SHA-1 3b77c4c849 is already in history

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

Change-Id: Iaf9cb221ec902fd5b975c18046deb3d6932f26d3