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

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



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