[automerger skipped] Merge "Update MultiSimSettingController with carrier...

[automerger skipped] Merge "Update MultiSimSettingController with carrier config change listener" into main am: 094cdb22 am: f07465d9 -s ours am: 68554226 -s ours am: 7c725e93 -s ours am: 7b7ec324 -s ours

am skip reason: Merged-In I677fcf604f05f4870b5253dc38b4ff2dc27800ae with SHA-1 fa7d389c is already in history

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



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