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: I762e3492a84c1afb885d7a2a18e3a665bb6a90a7 Signed-off-by: Automerger Merge Worker <[email protected]>