Merge "Update CarrierConfigLoader to use TM#getCarrierServicePackageName"