Merge "Fix unlock sim thread leak" into main am: 71c1c0a525

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

Change-Id: I409c388338e9309eb62e9f2332610d1b9a7978db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>