Merge branch 'authtokentype_always_null' of github.com:nextcloud/android into authtokentype_always_null

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