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

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

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