Merge "Activity gain focus failed in InputMethodStressTest" am: 7f5baabe am:...

Merge "Activity gain focus failed in InputMethodStressTest" am: 7f5baabe am: 2fad378d am: 16a324ff am: f98575cb

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



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