Merge pull request #35795 from dukenv0307/fix/35618 #12420

Job	Run time
test / test (job 1)	1m 51s
test / test (job 2)	1m 32s
test / Shell tests	41s
test / test (job 3)	1m 42s
lint / lint	3m 33s
test / Storybook tests	2m 4s
typecheck / typecheck	1m 8s
confirmPassingBuild	6s
chooseDeployActions	6s
skipDeploy	2s
createNewVersion	0s
e2ePerformanceTests / Build apk from latest release as a baseline	15m 35s
e2ePerformanceTests / Build apk from delta ref	16m 37s
updateStaging	0s
e2ePerformanceTests / Run E2E tests in AWS device farm	17m 55s
	1h 2m 52s

Provide feedback