Merge "Remove display policy references while waiting for window animation to complete" into sc-dev am: 37f493f5 am: 89da3fbc

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

Change-Id: If01830e13e4343725e611e43ec31a9151c90653b