Merge "Support multi SIM config change in CarrierConfigLoader" am: 447f7f87b8

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

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