Merge branch 'instrumented-tests-not-using-the-app-theme-droid-406' #7653

Job	Run time
Prepare	5s
Build native (x86_64, x86_64, x86_64-linux-android)	1m 59s
Generate relay list	2m 10s
Build native (i686, x86, i686-linux-android)	1m 57s
Build native (aarch64, arm64-v8a, aarch64-linux-android)	2m 3s
Build native (armv7, armeabi-v7a, armv7-linux-androideabi)	2m 19s
Build app and run unit tests	18m 29s
Run instrumented tests (app)	3m 54s
Run instrumented tests (mockapi)	1m 18s
	34m 14s

Provide feedback