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

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

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