Merge "Use the layout frame to decide whether to do a server sync" into...

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

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



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