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

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



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