Merge pull request #36277 from situchan/fix-patch-conflict #2

Job	Run time
lint / lint	4m 44s
test / test (job 1)	2m 46s
test / test (job 2)	3m 5s
test / test (job 3)	2m 52s
test / Shell tests	2m 10s
test / Storybook tests	2m 7s
typecheck / typecheck	1m 16s
confirmPassingBuild	8s
chooseDeployActions	8s
skipDeploy	2s
createNewVersion	0s
e2ePerformanceTests / Build apk from latest release as a baseline	1s
e2ePerformanceTests / Build apk from delta ref	1s
updateStaging	0s
e2ePerformanceTests / Run E2E tests in AWS device farm	0s
	19m 20s

Provide feedback