Merge "Handle CarrierConfig change when user state is unlock" into main am:...

Merge "Handle CarrierConfig change when user state is unlock" into main am: f236b741 am: 006e3bda am: 3b055c3b am: bf0d5eed am: 16c0a6c9

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



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