Merge "Pin tradefed dependencies to Java 11" am: f248774ff1 am: a1a566338b am: 9effceaaba Original change: https://android-review.googlesource.com/c/platform/external/junit/+/2419901 Change-Id: I6f08c336ee23b8c3e5e44bc4c9771060e60d5e36 Signed-off-by: Automerger Merge Worker <[email protected]>