Merge branch 'develop' into feature/aris/threads

# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	tools/check/forbidden_strings_in_code.txt

build.gradle

@@ -36,14 +36,6 @@ allprojects {
     apply plugin: "org.jlleitschuh.gradle.ktlint"
 
     repositories {
-        // For olm library.
-        maven {
-            url 'https://gitlab.matrix.org/api/v4/projects/27/packages/maven'
-            content {
-                groups.olm.regex.each { includeGroupByRegex it }
-                groups.olm.group.each { includeGroup it }
-            }
-        }
         maven {
             url 'https://jitpack.io'
             content {