Merge pull request #2806 from nextcloud/repo-sync/android-config/master

🔄 synced file(s) with nextcloud/android-config