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

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

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