[automerger skipped] Merge "Accept a Window as shown if it's in any...

[automerger skipped] Merge "Accept a Window as shown if it's in any transition" into tm-qpr-dev am: 0af48756 am: a736cc5e -s ours

am skip reason: Merged-In I47ce9fdf5429795cbf083516c19b669bc407d1da with SHA-1 d98e95c7 is already in history

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



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