Merge "Merge "Merge "Use correct timeout when gating sync transaction" into...

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

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



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