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