[automerger skipped] [automerge] DO NOT MERGE Revert "Accept a Window as shown...

[automerger skipped] [automerge] DO NOT MERGE Revert "Accept a Window as shown if it's in any transition" 2p: dd2ba83f am: b3272fb2 -s ours

am skip reason: subject contains skip directive

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



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