Merge "Add java flags from external/robolectric-shadows/robotest.sh to...

Merge "Add java flags from external/robolectric-shadows/robotest.sh to tradefed template" am: 92c35bda am: 9b957362

Original change: https://android-review.googlesource.com/c/platform/build/+/2254684



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