Merge "Waiting for test activity to be removed" into main

import androidx.test.ext.junit.rules.ActivityScenarioRule;

import androidx.test.platform.app.InstrumentationRegistry;

import com.android.server.wm.utils.CommonUtils;

import com.android.window.flags.Flags;

import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

        });

    }

    @After

    public void tearDown() {

        CommonUtils.waitUntilActivityRemoved(mActivity);

    }

    @RequiresFlagsDisabled(Flags.FLAG_SURFACE_TRUSTED_OVERLAY)

    @Test

    public void setTrustedOverlayInputWindow() throws InterruptedException {