Merge "Revert "Fix CarrierServiceConnection binding leak in CarrierConfigLoader""