Merge "Fix compile error on JDK 18 and later" into main am: 9a33f4130b

Original change: https://android-review.googlesource.com/c/platform/external/junit/+/2887826

Change-Id: I38af894f95e9610d444cd9f10c2c7d27401d324d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>