Merge "Update CarrierConfigLoader to use TM#getCarrierServicePackageName" am: bdeb5e046b am: 9f39d00e44

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

Change-Id: Ifb467c7630fcf7854a1a32404be4683359995a1d