KTOR-5814 Don't reparse query parameters when sending a request with … (

#3622)

* KTOR-5814 Don't reparse query parameters when sending a request with Android engine
* KTOR-5814 Fix formatting

buildSrc/src/main/kotlin/test/server/tests/Content.kt

@@ -19,6 +19,10 @@ import test.server.*
 internal fun Application.contentTestServer() {
     routing {
         route("/content") {
+            get("/uri") {
+                call.respondText { call.request.local.uri }
+            }
+
             get("/empty") {
                 call.respond("")
             }

ktor-client/ktor-client-android/jvm/src/io/ktor/client/engine/android/AndroidClientEngine.kt

@@ -44,7 +44,7 @@ public class AndroidClientEngine(override val config: AndroidEngineConfig) : Htt
 
         val requestTime = GMTDate()
 
-        val url: String = URLBuilder().takeFrom(data.url).buildString()
+        val url: String = data.url.toString()
         val outgoingContent: OutgoingContent = data.body
         val contentLength: Long? = data.headers[HttpHeaders.ContentLength]?.toLong()
             ?: outgoingContent.contentLength

ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/QueryTest.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014-2023 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package io.ktor.client.tests
+
+import io.ktor.client.request.*
+import io.ktor.client.statement.*
+import io.ktor.client.tests.utils.*
+import io.ktor.http.*
+import kotlin.test.*
+
+class QueryTest : ClientLoader() {
+    @Test
+    fun queryParametersArentModified() = clientTests {
+        test { client ->
+            val result = client.get {
+                url {
+                    encodedParameters.apply {
+                        url.encodedParameters.appendAll("", emptyList())
+                        url.takeFrom("$TEST_SERVER/content/uri?Expires")
+                    }
+                }
+            }.bodyAsText()
+            assertEquals("/content/uri?&Expires", result)
+        }
+    }
+}