Fixes for firebase e2e still sometimes failing #13360

Job	Run time
Prepare	4s
Generate debug keystore	8s
Build native (x86_64, x86_64, x86_64-linux-android)	4m 3s
Generate relay list	2m 15s
Build native (i686, x86, i686-linux-android)	3m 56s
Run lint and test tasks (testDebugUnitTest -x :test:arch:testDebugUnitTest :app:testOssProdDebugU...	6m 4s
Run lint and test tasks (:test:arch:test --rerun-tasks)	4m 48s
Build native (aarch64, arm64-v8a, aarch64-linux-android)	3m 53s
Build native (armv7, armeabi-v7a, armv7-linux-androideabi)	4m 8s
Run lint and test tasks (detekt)	4m 32s
Run lint and test tasks (lint)	7m 57s
Build app	8m 1s
Build instrumented test packages (app, assembleOssProdAndroidTest, android/app/build/outputs/apk)	6m 57s
Build instrumented test packages (mockapi, :test:mockapi:assemble, android/test/mockapi/build/out...	6m 17s
Build instrumented test packages (e2e, :test:e2e:assemble, android/test/e2e/build/outputs/apk)	6m 36s
Run instrumented tests (app, android/app/build/outputs/apk, 1)	6m 6s
Run instrumented tests (mockapi, android/test/mockapi/build/outputs/apk, 1)	3m 4s
Run firebase tests	0s
Run instrumented e2e tests	0s
	1h 18m 49s

Provide feedback