[5.4] Process: Adapt #2928 for Android#2945

spevans merged 1 commit intoswiftlang:release/5.4swiftlang/swift-corelibs-foundation:release/5.4from

finagolfin:droidfinagolfin/swift-corelibs-foundation:droidCopy head branch name to clipboard