Merge branch 'connectivityutils-powermock-test' of github.com:nextcloud/android into connectivityutils-powermock-test

Signed-off-by: ardevd <edvard.holst@gmail.com>