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

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

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