Merge "Fix test failure due to out of UI thread runnning."

import android.perftests.utils.StubActivity;

import android.support.test.filters.LargeTest;

import android.support.test.runner.AndroidJUnit4;

import android.support.test.annotation.UiThreadTest;

import android.support.test.rule.ActivityTestRule;

import android.support.test.InstrumentationRegistry;

    }

    @Test

    @UiThreadTest

    public void testEditText() {

    public void testEditText() throws Throwable {

        mActivityRule.runOnUiThread(() -> {

            BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

            final EditText editText = setupEditText();

            final KeyEvent keyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER);

                    editText.updateDisplayListIfDirty();

                }

            }

        });

    }

}