Merge "Update the imports to androidx.test.filters.*" into main

 */

package com.android.shell;

import android.test.suitebuilder.annotation.SmallTest;

import junit.framework.TestCase;

import static com.android.shell.BugreportProgressService.isValid;

import androidx.test.filters.SmallTest;

import junit.framework.TestCase;

@SmallTest

public class UtilitiesTest extends TestCase {