Merge "Merge "Remove display policy references while waiting for window...

Merge "Merge "Remove display policy references while waiting for window animation to complete" into sc-dev am: 37f493f5 am: f8ca1f7e" into sc-v2-dev-plus-aosp am: 519cdfe9

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

Change-Id: Ia4c8f704c12c8424f3c221bd1bf6302d421d1d7c