Turn the last trunk-only patch into a sed substitution instead

Author: finagolfin

swift-ci/sdks/android/patches/swift-android-trunk.patch

@@ -433,6 +433,10 @@ for arch in $archs; do
         # use an out-of-tree build folder
         export SWIFT_BUILD_ROOT=${build_dir}/swift-project
 
+        # This `git grep` invocation in a trunk test fails in our Docker for some
+        # reason, so just turn it into a plain `grep` again.
+        sed -i -E 's:"git",:#:' swift/test/Misc/verify-swift-feature-testing.test-sh
+
         ./swift/utils/build-script \
             $build_type_flag \
             --reconfigure \