[automerger skipped] Merge "Fixed remote SIM removal not working" into main...

[automerger skipped] Merge "Fixed remote SIM removal not working" into main am: 0b84cee5 am: 50f3178d -s ours am: e6f99b0a -s ours am: b2fa36ae -s ours

am skip reason: Merged-In I547024e1390fbc868bc7460bef1f19025a4d1cc5 with SHA-1 2444b3c6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2681502



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