Merge "Report more information for testRemoveWithDelayed..." am: cdcc4abc25 am: 2f3df2acb6

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1703666

Change-Id: Ia75ae8bfcf8d050eb1f62f4a76af598d468c73a8