[Backport 2.x] add saved queries to vpc flow #5428

Job	Run time
build-windows-macos (windows-latest)	23m 20s
build-windows-macos (macos-latest)	15m 46s
Get-CI-Image-Tag / Get-CI-Image-Tag	8s
build	14m 57s
	54m 11s

Provide feedback