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

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

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