Merge "BLASTSyncEngine: Logging and trace around commit timeout" into tm-dev am: c0573c9851 am: fb8a245885 am: 07baf28137

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

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