[automerger skipped] Extra generic type information to aid certain javacs. am: 3f98e79978 -s ours am skip reason: Change-Id I1ebe37da89049dcc72c8a0d6b65757e7a8292cfc with SHA-1 75dd2ceb50 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799493 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieedaf1e03c1ccc50c14a8ff715fadffd1c5ae67a