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

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

am skip reason: subject contains skip directive

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



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