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

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

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