[automerger skipped] Merge "Carrier config's SIM state is wrong after Modem do sim refresh with ISIM aid." am: 14a93f11 am: e036ac95 am: 3d04ebfc am: aeb8b28e -s ours

am skip reason: Change-Id I4fdf8111629424653968481c602570dd0e85c087 with SHA-1 37ba812b is in history

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

Change-Id: I629e0572108616c356508ea1bb65ca74168f8f2f