[automerger skipped] Don't convert assumption failures into errors in ErrorCollector.addError(). am: ccf3392c72 -s ours am: 7114aba399 -s ours am skip reason: Change-Id I578a2676e52882c7d25d99061310ea38101883f6 with SHA-1 d3857e4983 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799496 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If3150b4e7e7e231db54d7e57f5859ad11f0304da