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

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

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



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