Merge "Convert PermissionsTest to JUnit 4" into main

package com.android.documentsui;

import static org.junit.Assert.assertEquals;

import android.Manifest;

import android.content.pm.PackageManager;

import org.junit.Test;

public class PermissionsTest extends ActivityTest<FilesActivity> {

    private static final String TAG = "PermissionsTest";

    public PermissionsTest() {

        super(FilesActivity.class);

    }

    @Override

    public void setUp() throws Exception {

        super.setUp();

    }

public class PermissionsTest extends ActivityTestJunit4<FilesActivity> {

    @Test

    public void testPermissionGranted_interactAcrossUsersOnR() {

        if (VersionUtils.isAtLeastR()) {