Merge "Force relayout if sync operation is requested explicitly" into sc-dev...

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

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

Change-Id: I02d2db2daa29d526436c33de3a8ad98cd19638f1