Android deeplink sends "path + query" instead of just path

.gitignore

@@ -4,10 +4,13 @@
 .*.sw?
 .DS_Store
 .ccls-cache
+.cipd/
 .classpath
 .clangd/
 .cproject
 .dart_tool
+.gclient
+.gclient_entries
 .gdb_history
 .checkstyle
 .gdbinit

shell/platform/android/io/flutter/embedding/android/FlutterActivityAndFragmentDelegate.java

@@ -399,7 +399,11 @@ private String maybeGetInitialRouteFromIntent(Intent intent) {
     if (host.shouldHandleDeeplinking()) {
       Uri data = intent.getData();
       if (data != null && !data.getPath().isEmpty()) {
-        return data.getPath();
+        String pathAndQuery = data.getPath();
+        if (!data.getQuery().isEmpty()) {
+          pathAndQuery += "?" + data.getQuery();
+        }
+        return pathAndQuery;
       }
     }
     return null;

shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java

@@ -433,7 +433,7 @@ public void itForwardsOnRequestPermissionsResultToFlutterEngine() {
   public void
       itSendsInitialRouteFromIntentOnStartIfNoInitialRouteFromActivityAndShouldHandleDeeplinking() {
     Intent intent = FlutterActivity.createDefaultIntent(RuntimeEnvironment.application);
-    intent.setData(Uri.parse("http://myApp/custom/route"));
+    intent.setData(Uri.parse("http://myApp/custom/route?query=test"));
 
     ActivityController<FlutterActivity> activityController =
         Robolectric.buildActivity(FlutterActivity.class, intent);
@@ -452,7 +452,8 @@ public void itForwardsOnRequestPermissionsResultToFlutterEngine() {
     delegate.onStart();
 
     // Verify that the navigation channel was given the initial route message.
-    verify(mockFlutterEngine.getNavigationChannel(), times(1)).setInitialRoute("/custom/route");
+    verify(mockFlutterEngine.getNavigationChannel(), times(1))
+        .setInitialRoute("/custom/route?query=test");
   }
 
   @Test
@@ -491,12 +492,13 @@ public void itSendsPushRouteMessageWhenOnNewIntent() {
     delegate.onAttach(RuntimeEnvironment.application);
 
     Intent mockIntent = mock(Intent.class);
-    when(mockIntent.getData()).thenReturn(Uri.parse("http://myApp/custom/route"));
+    when(mockIntent.getData()).thenReturn(Uri.parse("http://myApp/custom/route?query=test"));
     // Emulate the host and call the method that we expect to be forwarded.
     delegate.onNewIntent(mockIntent);
 
     // Verify that the navigation channel was given the push route message.
-    verify(mockFlutterEngine.getNavigationChannel(), times(1)).pushRoute("/custom/route");
+    verify(mockFlutterEngine.getNavigationChannel(), times(1))
+        .pushRoute("/custom/route?query=test");
   }
 
   @Test