Merge "Avoid extra force-relayout for sync" into tm-qpr-dev am: 51041e3c am: d8ded730

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



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