Merge "Attempt fixing test flakiness" into main

import android.window.WindowContextInfo;

import android.window.WindowTokenClientController;

import androidx.test.filters.FlakyTest;

import androidx.test.filters.MediumTest;

import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.rule.ActivityTestRule;

            // Execute a local relaunch item with current scaled config (e.g. simulate recreate),

            // the config should not be scaled again.

            final Configuration currentConfig = activity.getResources().getConfiguration();

            final ClientTransaction localTransaction =

                    newTransaction(activityThread, activity.getActivityToken());

            localTransaction.addCallback(ActivityRelaunchItem.obtain(

                    null /* pendingResults */, null /* pendingIntents */, 0 /* configChanges */,

                    new MergedConfiguration(currentConfig, currentConfig),

                    true /* preserveWindow */));

            InstrumentationRegistry.getInstrumentation().runOnMainSync(

                    () -> activityThread.executeTransaction(localTransaction));

                    () -> activityThread.executeTransaction(

                            newRelaunchResumeTransaction(activity)));

            assertScreenScale(scale, activity, originalActivityConfig, originalActivityMetrics);

        } finally {

        });

    }

    @FlakyTest(bugId = 298331121)

    @Test

    public void testHandleConfigurationChanged_DoesntOverrideActivityConfig() {

        final TestActivity activity = mActivityTestRule.launchActivity(new Intent());