Merge "Optimize TM#getCarrierServicePackageName[ForLogicalSlot]" into tm-dev