Merge branch 'support-running-under-build-variant-app-ids-droid-343' #6932

Job	Run time
Prepare	4s
Build native (x86_64, x86_64, x86_64-linux-android)	2m 13s
Generate relay list	1m 48s
Build native (i686, x86, i686-linux-android)	2m 4s
Build native (aarch64, arm64-v8a, aarch64-linux-android)	2m 5s
Build native (armv7, armeabi-v7a, armv7-linux-androideabi)	1m 53s
Build app and run unit tests	14m 54s
Run instrumented tests (app)	3m 39s
Run instrumented tests (mockapi)	1m 17s
	29m 57s

Provide feedback