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 am: 222d4ea9

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



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