[automerger skipped] Merge "Fix ReOpenImeWindowTest flicker test for shell...

[automerger skipped] Merge "Fix ReOpenImeWindowTest flicker test for shell transitions" into sc-v2-dev am: 5d404612 am: 72cd50a8 -s ours

am skip reason: Merged-In I33c5b6327e5b5762958b66ff20d5fe67b9566c10 with SHA-1 8324e78f is already in history

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

Change-Id: I071d779ab13f3cfd3cd5f28cda5cf11310bbe1d2