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

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

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