Merge "Refresh sim lock state when carrier config is changed" am: d1505ca8a5 am: 1ecff16a54

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

Change-Id: Ic3de61c55bc47a7f700d610f92f4c72c6dd54d35