Merge "Finish sync for relayout a drawn window" into tm-qpr-dev am: 4d18e2d5

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



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