Remove unnecessary else block within when statements #8600

Job	Run time
Prepare	5s
Build native (x86_64, x86_64, x86_64-linux-android)	1m 27s
Generate relay list	1m 20s
Build native (i686, x86, i686-linux-android)	1m 30s
Build native (aarch64, arm64-v8a, aarch64-linux-android)	1m 31s
Build native (armv7, armeabi-v7a, armv7-linux-androideabi)	1m 28s
Build app and run unit tests	8m 35s
Run instrumented tests (app)	5m 16s
Run instrumented tests (mockapi)	1m 58s
Run instrumented firebase tests	0s
	23m 10s

Provide feedback