[automerger skipped] Merge "DO NOT MERGE Revert "Accept a Window as shown if it's in any transition"" into tm-qpr-dev am: 15feebba9f am: 51b6c0d176 -s ours am: a6169f8753 -s ours am: a396091ff3 -s ours

am skip reason: subject contains skip directive

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

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