Merge "Clean additional Robolectric variable" am: 539fbc28 am: 5a678d06 am: 74aebc8e

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



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