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

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

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