Merge "Avoid waiting for drawn window without change" into udc-qpr-dev am:...

Merge "Avoid waiting for drawn window without change" into udc-qpr-dev am: 15fcf5b7 am: de6be5fa

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



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