[automerger skipped] Merge "Update CarrierConfigLoader to use TM#getCarrierServicePackageName" am: bdeb5e046b am: 9f39d00e44 am: 3b2510151e -s ours am: 5a7d123adf -s ours

am skip reason: Merged-In Id128e9df7a3d4460d789e5455ff6b5745c374183 with SHA-1 f7c214a311 is already in history

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

Change-Id: I01c1b4f4bc9547b0f6f50698f9dbf436efa5446d