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

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



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