[automerger skipped] Merge "Support multi SIM config change in CarrierConfigLoader" am: 447f7f87b8 am: 8521b5df11 -s ours

am skip reason: Merged-In I590fa27a9aee202c6524dff56e5e098fb4f6e1ce with SHA-1 8f16f3e21d is already in history

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

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