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

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

Change-Id: I20ef081998426261b82176a5933ab1336f605439