Merge "Update CarrierConfigLoader to support phoneId for getCarrerConfig" am: 2206142c12

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

Change-Id: I6a500bfcef8e8e89ecf12e365d869f753998020a