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

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



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