Merge "Update CarrierConfigLoader to use TM#getCarrierServicePackageName" into tm-dev am: 3eab8bfc12

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

Change-Id: I2feb4fa9290d4edec00f8511ffc8f3af3210fc09