Merge "BLASTSyncEngine: Logging and trace around commit timeout" into tm-dev am: c0573c9851 am: 10763ffd31 am: 66946d0fcf am: 2cddf342e3

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

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