Merge "Activity gain focus failed in InputMethodStressTest" am: 7f5baabe2a am: 2fad378d72

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2194375

Change-Id: I68a29c1dbd3a1ae892ab71c904c0174b1786d2b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>