Merge "Use correct timeout when gating sync transaction" into tm-dev am:...

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

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



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