Merge "BLASTSyncEngine: Logging and trace around commit timeout" into tm-dev am: c0573c98 am: fb8a2458 am: 07baf281 am: 17facd26

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



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