[automerger skipped] Merge "Refresh sim lock state when carrier config is changed" am: d1505ca8a5 am: 1ecff16a54 am: 82b709ef4a -s ours

am skip reason: Merged-In I6f05d303db90020292e8e84cd2064eaea4f27cbb with SHA-1 06bdef1031 is already in history

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

Change-Id: I7e62b2402eeddd99d37537e59bf8936c0f7b4510