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

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

Change-Id: I792832acc7982e9aa0a7a3dbc1bedc7a592b9008