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

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

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