Merge "Force relayout if sync operation is requested explicitly" into sc-dev am: 2498beaa

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

Change-Id: I2e253bfeb12220145e38fc1c1a144861a2fbf629