Merge "Add traces to explain test failures" am: 444ea4c79f

Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2454706

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