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

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

Change-Id: I428f7ef44da84f2da8dbe2d07c6ae6ccdbf5310a