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

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



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