Merge "Pin tradefed dependencies to Java 11" am: f248774ff1 am: a1a566338b

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

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