Merge "Use the layout frame to decide whether to do a server sync" into tm-qpr-dev am: ea79cc5178

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

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