Merge pull request #34078 from situchan/revert-33561-fix/29743-androi… #11771

Job	Run time
typecheck / typecheck	2m 27s
lint / lint	4m 21s
test / test (job 1)	3m 6s
test / Shell tests	2m 15s
test / test (job 2)	2m 40s
test / test (job 3)	2m 44s
test / Storybook tests	3m 6s
confirmPassingBuild	4s
chooseDeployActions	6s
skipDeploy	2s
createNewVersion	0s
e2ePerformanceTests / Build apk from delta ref	9m 21s
e2ePerformanceTests / Build apk from latest release as a baseline	10m 8s
updateStaging	0s
e2ePerformanceTests / Run E2E tests in AWS device farm	0s
	40m 20s

Provide feedback