Merge branch 'add-another-settings-schema-version-due-to-changes-in-h… #8592

Job	Run time
Prepare	9s
Build native (x86_64, x86_64, x86_64-linux-android)	3m 36s
Generate relay list	1m 23s
Build native (i686, x86, i686-linux-android)	3m 39s
Build native (aarch64, arm64-v8a, aarch64-linux-android)	3m 45s
Build native (armv7, armeabi-v7a, armv7-linux-androideabi)	3m 41s
Build app and run unit tests	7m 2s
Run instrumented tests (app)	5m 58s
Run instrumented tests (mockapi)	1m 39s
Run instrumented firebase tests	0s
	30m 52s

Provide feedback