[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: e015857610 -s ours am: 415e8883f5 -s ours am: efe9bb63cf -s ours am: de440f6a5d -s ours am skip reason: Merged-In I9f46bd63b05b162864a19eef3588951fea8940d8 with SHA-1 7114aba399 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/15571637 Change-Id: Idf7afac3d9d286442002453b9cceabb32fa8a023