[ci/on-merge] Wait for quick checks and build to complete (#180537)

Before proceeding with tests. This is already implemented in the pull
request pipeline, and will allow the pipeline to end early if there's
lint errors.

.buildkite/pipelines/on_merge.yml

@@ -39,6 +39,19 @@ steps:
         - exit_status: '*'
           limit: 1
 
+  - command: .buildkite/scripts/steps/quick_checks.sh
+    label: 'Quick Checks'
+    agents:
+      queue: n2-2-spot
+    key: quick_checks
+    timeout_in_minutes: 60
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+
+  - wait
+
   - command: .buildkite/scripts/steps/on_merge_api_docs.sh
     label: Check Public API Docs
     key: public-api-docs
@@ -363,16 +376,6 @@ steps:
         - exit_status: '-1'
           limit: 3
 
-  - command: .buildkite/scripts/steps/quick_checks.sh
-    label: 'Quick Checks'
-    agents:
-      queue: n2-2-spot
-    timeout_in_minutes: 60
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3
-
   - command: .buildkite/scripts/steps/checks.sh
     label: 'Checks'
     agents:

.buildkite/pipelines/pull_request/base.yml

@@ -23,7 +23,6 @@ steps:
     label: 'Quick Checks'
     agents:
       queue: n2-2-spot
-    key: quick_checks
     timeout_in_minutes: 60
     retry:
       automatic: