Merge pull request #34005 from aswin-s/fix/issue-31785 #11724

Job	Run time
lint / lint	3m 21s
test / Storybook tests	1m 58s
test / Shell tests	55s
test / test (job 1)	2m 6s
test / test (job 2)	1m 26s
test / test (job 3)	1m 37s
typecheck / typecheck	1m 15s
confirmPassingBuild	6s
chooseDeployActions	12s
skipDeploy	4s
createNewVersion	0s
e2ePerformanceTests / Build apk from latest release as a baseline	22m 3s
e2ePerformanceTests / Build apk from delta ref	22m 14s
updateStaging	0s
e2ePerformanceTests / Run E2E tests in AWS device farm	42m 32s
	1h 39m 49s

Provide feedback