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: 2e875e3f

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



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