Merge branch 'replace-topbars-constraintlayout-with-row-droid-340' #6967

Job	Run time
Prepare	6s
Generate relay list	1m 44s
Build native (x86_64, x86_64, x86_64-linux-android)	2m 0s
Build native (i686, x86, i686-linux-android)	2m 28s
Build native (aarch64, arm64-v8a, aarch64-linux-android)	1m 54s
Build native (armv7, armeabi-v7a, armv7-linux-androideabi)	2m 0s
Build app and run unit tests	15m 59s
Run instrumented tests (app)	3m 43s
Run instrumented tests (mockapi)	1m 9s
	31m 3s

Provide feedback