Merge "Prevent windows from drawing if they're in an active sync set" into...

Merge "Prevent windows from drawing if they're in an active sync set" into tm-qpr-dev am: 7534f6e7 am: a435d43e

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



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