Merge "Use correct timeout when gating sync transaction" into tm-dev am: 5f803607 am: ce1a6451

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



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